summaryrefslogtreecommitdiffstats
path: root/drivers/zorro
diff options
context:
space:
mode:
authorYani Ioannou2005-05-17 12:44:04 +0200
committerGreg Kroah-Hartman2005-06-21 00:15:35 +0200
commit060b8845e6bea938d65ad6f89e83507e5ff4fec4 (patch)
treeba82ce7d7a532b045f02e29788ece53d6be693e6 /drivers/zorro
parent[PATCH] Driver Core: drivers/s390/net/qeth_sys.c - drivers/usb/gadget/pxa2xx_... (diff)
downloadkernel-qcow2-linux-060b8845e6bea938d65ad6f89e83507e5ff4fec4.tar.gz
kernel-qcow2-linux-060b8845e6bea938d65ad6f89e83507e5ff4fec4.tar.xz
kernel-qcow2-linux-060b8845e6bea938d65ad6f89e83507e5ff4fec4.zip
[PATCH] Driver Core: drivers/usb/input/aiptek.c - drivers/zorro/zorro-sysfs.c: update device attribute callbacks
Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/zorro')
-rw-r--r--drivers/zorro/zorro-sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index dad03fc33a44..04ca8840acf1 100644
--- 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);