diff options
author | Linus Torvalds | 2005-06-21 01:00:33 +0200 |
---|---|---|
committer | Linus Torvalds | 2005-06-21 01:00:33 +0200 |
commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/mca/mca-bus.c | |
parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | [PATCH] PCI: fix show_modalias() function due to attribute change (diff) | |
download | kernel-qcow2-linux-1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.tar.gz kernel-qcow2-linux-1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.tar.xz kernel-qcow2-linux-1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.zip |
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 = { }; EXPORT_SYMBOL (mca_bus_type); -static ssize_t mca_show_pos_id(struct device *dev, char *buf) +static ssize_t mca_show_pos_id(struct device *dev, struct device_attribute *attr, char *buf) { /* four digits, \n and trailing \0 */ 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) len = sprintf(buf, "none\n"); return len; } -static ssize_t mca_show_pos(struct device *dev, char *buf) +static ssize_t mca_show_pos(struct device *dev, struct device_attribute *attr, char *buf) { /* enough for 8 two byte hex chars plus space and new line */ int j, len=0; |