[PATCH] Driver Core: drivers/usb/input/aiptek.c - drivers/zorro/zorro-sysfs.c: update...

[sfrench/cifs-2.6.git] / drivers / zorro / zorro-sysfs.c

diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index dad03fc33a44fe34c1b968c5d81918d97298bf2e..04ca8840acf1c4d394c32bb6bcb6013f19a2d45c 100644 (file)
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -21,7 +21,7 @@
 /* show configuration fields */
 #define zorro_config_attr(name, field, format_string)                  \
 static ssize_t                                                         \
-show_##name(struct device *dev, char *buf)                             \
+show_##name(struct device *dev, struct device_attribute *attr, char *buf)                              \
 {                                                                      \
        struct zorro_dev *z;                                            \
                                                                        \
@@ -36,7 +36,7 @@ zorro_config_attr(serial, rom.er_SerialNumber, "0x%08x\n");
 zorro_config_attr(slotaddr, slotaddr, "0x%04x\n");
 zorro_config_attr(slotsize, slotsize, "0x%04x\n");
 
-static ssize_t zorro_show_resource(struct device *dev, char *buf)
+static ssize_t zorro_show_resource(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct zorro_dev *z = to_zorro_dev(dev);