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/eisa/eisa-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/eisa/eisa-bus.c')
| -rw-r--r-- | drivers/eisa/eisa-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c index 6381ba53853c..1937743c8e29 100644 --- a/drivers/eisa/eisa-bus.c +++ b/drivers/eisa/eisa-bus.c @@ -149,7 +149,7 @@ void eisa_driver_unregister (struct eisa_driver *edrv) driver_unregister (&edrv->driver); } -static ssize_t eisa_show_sig (struct device *dev, char *buf) +static ssize_t eisa_show_sig (struct device *dev, struct device_attribute *attr, char *buf) { struct eisa_device *edev = to_eisa_device (dev); return sprintf (buf,"%s\n", edev->id.sig); @@ -157,7 +157,7 @@ static ssize_t eisa_show_sig (struct device *dev, char *buf) static DEVICE_ATTR(signature, S_IRUGO, eisa_show_sig, NULL); -static ssize_t eisa_show_state (struct device *dev, char *buf) +static ssize_t eisa_show_state (struct device *dev, struct device_attribute *attr, char *buf) { struct eisa_device *edev = to_eisa_device (dev); return sprintf (buf,"%d\n", edev->state & EISA_CONFIG_ENABLED); |