From 924730af31bae23667959d4bfdcf0b27781f0d45 Mon Sep 17 00:00:00 2001
From: Komuro <komurojun-mbn@nifty.com>
Date: Sun, 2 Nov 2008 19:33:24 +0900
Subject: [PATCH] --- yaml --- r: 119053 b: refs/heads/master c:
 3e879f61434632ca099804713099f8f1627f929e h: refs/heads/master i:   119051:
 7ef8a43b66ef662489c999bdd24e8cfa2435a197 v: v3

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

diff --git a/[refs] b/[refs]
index 1fc207a0662c..468d36297443 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60df3de8b1f5ce085049e9e3c83d96643c426158
+refs/heads/master: 3e879f61434632ca099804713099f8f1627f929e
diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c
index 795660255490..00eee1435dca 100644
--- a/trunk/drivers/pcmcia/ds.c
+++ b/trunk/drivers/pcmcia/ds.c
@@ -668,6 +668,8 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
         list_for_each_entry(tmp_dev, &s->devices_list, socket_device_list)
                 if (p_dev->func == tmp_dev->func) {
 			p_dev->function_config = tmp_dev->function_config;
+			p_dev->io = tmp_dev->io;
+			p_dev->irq = tmp_dev->irq;
 			kref_get(&p_dev->function_config->ref);
 		}