From 79c2f4d5dc125bbc1428fd5480e77f7a303fae9e Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 24 Mar 2009 16:38:22 -0700
Subject: [PATCH] --- yaml --- r: 133421 b: refs/heads/master c:
 f2fecec51ad593cce1b07a2b54830a8412a441ea h: refs/heads/master i:   133419:
 c70e3505c7fe47b00ff3b339ab228785a009b59a v: v3

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

diff --git a/[refs] b/[refs]
index 8e70d97a3d97..60a14f8aad89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df388556d7d845983c0da3a4a49873472c466275
+refs/heads/master: f2fecec51ad593cce1b07a2b54830a8412a441ea
diff --git a/trunk/drivers/pcmcia/rsrc_mgr.c b/trunk/drivers/pcmcia/rsrc_mgr.c
index c0e2afc79e3e..e592e0e0d7ed 100644
--- a/trunk/drivers/pcmcia/rsrc_mgr.c
+++ b/trunk/drivers/pcmcia/rsrc_mgr.c
@@ -153,7 +153,7 @@ static struct resource *iodyn_find_io_region(unsigned long base, int num,
 		unsigned long align, struct pcmcia_socket *s)
 {
 	struct resource *res = make_resource(0, num, IORESOURCE_IO,
-					     s->dev.bus_id);
+					     dev_name(&s->dev));
 	struct pcmcia_align_data data;
 	unsigned long min = base;
 	int ret;