]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()
authorKay Sievers <kay.sievers@vrfy.org>
Tue, 24 Mar 2009 23:38:22 +0000 (16:38 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 24 Mar 2009 23:38:22 +0000 (16:38 -0700)
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>
drivers/pcmcia/rsrc_mgr.c

index c0e2afc79e3e4555877562498d30035aa65815ae..e592e0e0d7ed3a88dcdb0b4379b1ad69edfd3cc3 100644 (file)
@@ -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;