From 794ec87414f3c87a207b72bdda902152d2665bb5 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Thu, 30 Jun 2005 02:58:47 -0700
Subject: [PATCH] --- yaml --- r: 3990 b: refs/heads/master c:
 3704511b2ee8b01475ca7c171d62c682342fa38e h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pcmcia/ds.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index da24f3b390d2..a1caa7c7e63c 100644
--- 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
index cabddd49f6ff..d5afd557fe37 100644
--- 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;