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/pcmcia/ds.c | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/pcmcia/ds.c')
| -rw-r--r-- | drivers/pcmcia/ds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index c4ade288c5da..569e55feecfd 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
| @@ -604,14 +604,14 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) { | |||
| 604 | /************************ per-device sysfs output ***************************/ | 604 | /************************ per-device sysfs output ***************************/ |
| 605 | 605 | ||
| 606 | #define pcmcia_device_attr(field, test, format) \ | 606 | #define pcmcia_device_attr(field, test, format) \ |
| 607 | static ssize_t field##_show (struct device *dev, char *buf) \ | 607 | static ssize_t field##_show (struct device *dev, struct device_attribute *attr, char *buf) \ |
| 608 | { \ | 608 | { \ |
| 609 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ | 609 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ |
| 610 | return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \ | 610 | return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \ |
| 611 | } | 611 | } |
| 612 | 612 | ||
| 613 | #define pcmcia_device_stringattr(name, field) \ | 613 | #define pcmcia_device_stringattr(name, field) \ |
| 614 | static ssize_t name##_show (struct device *dev, char *buf) \ | 614 | static ssize_t name##_show (struct device *dev, struct device_attribute *attr, char *buf) \ |
| 615 | { \ | 615 | { \ |
| 616 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ | 616 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ |
| 617 | return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \ | 617 | return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \ |