projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cris-for-3.14' of git://jni.nu/cris
[cascardo/linux.git]
/
drivers
/
pcmcia
/
i82092.c
diff --git
a/drivers/pcmcia/i82092.c
b/drivers/pcmcia/i82092.c
index
519c4d6
..
7d47456
100644
(file)
--- a/
drivers/pcmcia/i82092.c
+++ b/
drivers/pcmcia/i82092.c
@@
-608,7
+608,7
@@
static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
enter("i82092aa_set_mem_map");
- pcibios_resource_to_bus(sock_info->dev, ®ion, mem->res);
+ pcibios_resource_to_bus(sock_info->dev
->bus
, ®ion, mem->res);
map = mem->map;
if (map > 4) {