diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:22 -0400 |
commit | f2fecec51ad593cce1b07a2b54830a8412a441ea (patch) | |
tree | 717d162ecdcbf0b7bc98a3b06896467d0c579892 /drivers | |
parent | df388556d7d845983c0da3a4a49873472c466275 (diff) |
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')
-rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 2 |
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, | |||
153 | unsigned long align, struct pcmcia_socket *s) | 153 | unsigned long align, struct pcmcia_socket *s) |
154 | { | 154 | { |
155 | struct resource *res = make_resource(0, num, IORESOURCE_IO, | 155 | struct resource *res = make_resource(0, num, IORESOURCE_IO, |
156 | s->dev.bus_id); | 156 | dev_name(&s->dev)); |
157 | struct pcmcia_align_data data; | 157 | struct pcmcia_align_data data; |
158 | unsigned long min = base; | 158 | unsigned long min = base; |
159 | int ret; | 159 | int ret; |