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/mca/mca-bus.c | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/mca/mca-bus.c')
| -rw-r--r-- | drivers/mca/mca-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mca/mca-bus.c b/drivers/mca/mca-bus.c index ff9be67c2a15..09baa43b2599 100644 --- a/drivers/mca/mca-bus.c +++ b/drivers/mca/mca-bus.c | |||
| @@ -69,7 +69,7 @@ struct bus_type mca_bus_type = { | |||
| 69 | }; | 69 | }; |
| 70 | EXPORT_SYMBOL (mca_bus_type); | 70 | EXPORT_SYMBOL (mca_bus_type); |
| 71 | 71 | ||
| 72 | static ssize_t mca_show_pos_id(struct device *dev, char *buf) | 72 | static ssize_t mca_show_pos_id(struct device *dev, struct device_attribute *attr, char *buf) |
| 73 | { | 73 | { |
| 74 | /* four digits, \n and trailing \0 */ | 74 | /* four digits, \n and trailing \0 */ |
| 75 | struct mca_device *mca_dev = to_mca_device(dev); | 75 | struct mca_device *mca_dev = to_mca_device(dev); |
| @@ -81,7 +81,7 @@ static ssize_t mca_show_pos_id(struct device *dev, char *buf) | |||
| 81 | len = sprintf(buf, "none\n"); | 81 | len = sprintf(buf, "none\n"); |
| 82 | return len; | 82 | return len; |
| 83 | } | 83 | } |
| 84 | static ssize_t mca_show_pos(struct device *dev, char *buf) | 84 | static ssize_t mca_show_pos(struct device *dev, struct device_attribute *attr, char *buf) |
| 85 | { | 85 | { |
| 86 | /* enough for 8 two byte hex chars plus space and new line */ | 86 | /* enough for 8 two byte hex chars plus space and new line */ |
| 87 | int j, len=0; | 87 | int j, len=0; |