[PATCH] USB: only make /sys/class/usb show up when there is something in it

[linux-2.6] / drivers / rapidio / rio-sysfs.c

diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index 73218a37506d90a808b369007a9ef3945ea02d15..bef9316e95df8b610302f0716f930b52bae383c7 100644 (file)
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -15,13 +15,14 @@
 #include <linux/rio.h>
 #include <linux/rio_drv.h>
 #include <linux/stat.h>
+#include <linux/sched.h>       /* for capable() */
 
 #include "rio.h"
 
 /* Sysfs support */
 #define rio_config_attr(field, format_string)                                  \
 static ssize_t                                                         \
-       field##_show(struct device *dev, char *buf)                     \
+field##_show(struct device *dev, struct device_attribute *attr, char *buf)                     \
 {                                                                      \
        struct rio_dev *rdev = to_rio_dev(dev);                         \
                                                                        \
@@ -35,7 +36,7 @@ rio_config_attr(asm_did, "0x%04x\n");
 rio_config_attr(asm_vid, "0x%04x\n");
 rio_config_attr(asm_rev, "0x%04x\n");
 
-static ssize_t routes_show(struct device *dev, char *buf)
+static ssize_t routes_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct rio_dev *rdev = to_rio_dev(dev);
        char *str = buf;