aboutsummaryrefslogtreecommitdiffstats
path: root/p21.patch
diff options
Diffstat (limited to 'p21.patch')
-rw-r--r--p21.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/p21.patch b/p21.patch
new file mode 100644
index 00000000000000..55c4eef9ed6ac9
--- /dev/null
+++ b/p21.patch
@@ -0,0 +1,38 @@
+---
+ arch/sparc/kernel/vio.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+--- a/arch/sparc/kernel/vio.c
++++ b/arch/sparc/kernel/vio.c
+@@ -97,6 +97,7 @@ static ssize_t devspec_show(struct devic
+
+ return sprintf(buf, "%s\n", str);
+ }
++static DEVICE_ATTR_RO(devspec);
+
+ static ssize_t type_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+@@ -104,16 +105,18 @@ static ssize_t type_show(struct device *
+ struct vio_dev *vdev = to_vio_dev(dev);
+ return sprintf(buf, "%s\n", vdev->type);
+ }
++static DEVICE_ATTR_RO(type);
+
+-static struct device_attribute vio_dev_attrs[] = {
+- __ATTR_RO(devspec),
+- __ATTR_RO(type),
+- __ATTR_NULL
++static struct attribute *vio_dev_attrs[] = {
++ &dev_attr_devspec.attr,
++ &dev_attr_type.attr,
++ NULL,
+ };
++ATTRIBUTE_GROUPS(vio_dev);
+
+ static struct bus_type vio_bus_type = {
+ .name = "vio",
+- .dev_attrs = vio_dev_attrs,
++ .dev_groups = vio_dev_groups,
+ .match = vio_bus_match,
+ .probe = vio_device_probe,
+ .remove = vio_device_remove,