summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-03-24 16:38:22 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-24 16:38:22 -0700
commitf2fecec51ad593cce1b07a2b54830a8412a441ea (patch)
tree717d162ecdcbf0b7bc98a3b06896467d0c579892 /drivers/pcmcia
parentdf388556d7d845983c0da3a4a49873472c466275 (diff)
downloadlinux-f2fecec51ad593cce1b07a2b54830a8412a441ea.tar.gz
linux-f2fecec51ad593cce1b07a2b54830a8412a441ea.tar.bz2
linux-f2fecec51ad593cce1b07a2b54830a8412a441ea.zip
pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: linux-pcmcia@lists.infradead.org Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/rsrc_mgr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index c0e2afc79e3e..e592e0e0d7ed 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/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;