---

yaml --- r: 133421 b: refs/heads/master c: f2fecec h: refs/heads/master i: 133419: c70e350 v: v3
git-mirror · Mar 24, 2009 · 79c2f4d · 79c2f4d
1 parent 1e4619a
commit 79c2f4d
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: df388556d7d845983c0da3a4a49873472c466275
+refs/heads/master: f2fecec51ad593cce1b07a2b54830a8412a441ea
diff --git 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;