diff options
author | Manuel Lauss <mano@roarinelk.homelinux.net> | 2007-02-21 08:47:20 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-23 17:52:09 -0500 |
commit | dfe461aef0d621d8472d0af343ae8a60866a7a8a (patch) | |
tree | 7ab7d45113ac74bc3b6e7df8685991052d04a8d7 /drivers/pcmcia/rsrc_mgr.c | |
parent | d56c3eae6753f53d3313b926dcdda38c6c9bbe9b (diff) |
Driver core: more fallout from class_device changes for pcmcia
More fallout from the PCMCIA class_device changes.
The first hunk is run-tested on SH-4, the others are converted
in the spirit of the original conversion.
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
-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 81dfc2cac2b4..ce2226273aaa 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c | |||
@@ -232,7 +232,7 @@ static struct resource *iodyn_find_io_region(unsigned long base, int num, | |||
232 | unsigned long align, struct pcmcia_socket *s) | 232 | unsigned long align, struct pcmcia_socket *s) |
233 | { | 233 | { |
234 | struct resource *res = make_resource(0, num, IORESOURCE_IO, | 234 | struct resource *res = make_resource(0, num, IORESOURCE_IO, |
235 | s->dev.class_id); | 235 | s->dev.bus_id); |
236 | struct pcmcia_align_data data; | 236 | struct pcmcia_align_data data; |
237 | unsigned long min = base; | 237 | unsigned long min = base; |
238 | int ret; | 238 | int ret; |