summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski2005-06-30 11:58:47 +0200
committerLinus Torvalds2005-06-30 17:45:08 +0200
commit3704511b2ee8b01475ca7c171d62c682342fa38e (patch)
treee6f59bcdaf513b241ba3ecb65900149e0c419564 /drivers/pcmcia
parentMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff)
downloadkernel-qcow2-linux-3704511b2ee8b01475ca7c171d62c682342fa38e.tar.gz
kernel-qcow2-linux-3704511b2ee8b01475ca7c171d62c682342fa38e.tar.xz
kernel-qcow2-linux-3704511b2ee8b01475ca7c171d62c682342fa38e.zip
[PATCH] pcmcia: fix modalias attribute in sysfs
Fix up PCMCIA modalias file in sysfs Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/ds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index cabddd49f6ff..d5afd557fe37 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -847,7 +847,7 @@ pcmcia_device_stringattr(prod_id2, prod_id[1]);
pcmcia_device_stringattr(prod_id3, prod_id[2]);
pcmcia_device_stringattr(prod_id4, prod_id[3]);
-static ssize_t modalias_show(struct device *dev, char *buf)
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
{
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
int i;