diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-27 05:38:58 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 05:38:58 +0200 |
| commit | 5696c1944a33b4434a9a1ebb6383b906afd43a10 (patch) | |
| tree | 16fbe6ba431bcf949ee8645510b0c2fd39b5810f /drivers/sh/superhyway/superhyway-sysfs.c | |
| parent | [wireless] ipw2100: fix build after applying SuSE cleanups (diff) | |
| parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-5696c1944a33b4434a9a1ebb6383b906afd43a10.tar.xz linux-5696c1944a33b4434a9a1ebb6383b906afd43a10.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/sh/superhyway/superhyway-sysfs.c')
| -rw-r--r-- | drivers/sh/superhyway/superhyway-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/superhyway/superhyway-sysfs.c b/drivers/sh/superhyway/superhyway-sysfs.c index 39ab6a12da76..dc119ce68e3e 100644 --- a/drivers/sh/superhyway/superhyway-sysfs.c +++ b/drivers/sh/superhyway/superhyway-sysfs.c @@ -15,7 +15,7 @@ #include <linux/superhyway.h> #define superhyway_ro_attr(name, fmt, field) \ -static ssize_t name##_show(struct device *dev, char *buf) \ +static ssize_t name##_show(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct superhyway_device *s = to_superhyway_device(dev); \ return sprintf(buf, fmt, s->field); \ |