diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/sh/superhyway/superhyway-sysfs.c | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-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 @@ | |||
| 15 | #include <linux/superhyway.h> | 15 | #include <linux/superhyway.h> |
| 16 | 16 | ||
| 17 | #define superhyway_ro_attr(name, fmt, field) \ | 17 | #define superhyway_ro_attr(name, fmt, field) \ |
| 18 | static ssize_t name##_show(struct device *dev, char *buf) \ | 18 | static ssize_t name##_show(struct device *dev, struct device_attribute *attr, char *buf) \ |
| 19 | { \ | 19 | { \ |
| 20 | struct superhyway_device *s = to_superhyway_device(dev); \ | 20 | struct superhyway_device *s = to_superhyway_device(dev); \ |
| 21 | return sprintf(buf, fmt, s->field); \ | 21 | return sprintf(buf, fmt, s->field); \ |