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/mmc/mmc_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/mmc/mmc_sysfs.c')
| -rw-r--r-- | drivers/mmc/mmc_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c index 29a56e9cd5b3..5556cd3b5559 100644 --- a/drivers/mmc/mmc_sysfs.c +++ b/drivers/mmc/mmc_sysfs.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #define to_mmc_driver(d) container_of(d, struct mmc_driver, drv) | 22 | #define to_mmc_driver(d) container_of(d, struct mmc_driver, drv) |
| 23 | 23 | ||
| 24 | #define MMC_ATTR(name, fmt, args...) \ | 24 | #define MMC_ATTR(name, fmt, args...) \ |
| 25 | static ssize_t mmc_##name##_show (struct device *dev, char *buf) \ | 25 | static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \ |
| 26 | { \ | 26 | { \ |
| 27 | struct mmc_card *card = dev_to_mmc_card(dev); \ | 27 | struct mmc_card *card = dev_to_mmc_card(dev); \ |
| 28 | return sprintf(buf, fmt, args); \ | 28 | return sprintf(buf, fmt, args); \ |