---

yaml --- r: 3990 b: refs/heads/master c: 3704511 h: refs/heads/master v: v3
git-mirror · Jun 30, 2005 · 794ec87 · 794ec87
1 parent 120925a
commit 794ec87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6
+refs/heads/master: 3704511b2ee8b01475ca7c171d62c682342fa38e
diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/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;