diff options
author | Magnus Damm <damm@opensource.se> | 2006-12-13 05:46:43 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-28 12:02:13 -0500 |
commit | 868575d1e87ff2091800aea816972ddb46de60d5 (patch) | |
tree | 95c50968098815dfe066e960922c4be3b003b27f /drivers/net/pcmcia/fmvj18x_cs.c | |
parent | f5560da549ea2e32dd41e36548c0e7dee3d4aabb (diff) |
pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
No logic changes, just pass struct pcmcia_device to pcmcia_map_mem_page()
[linux@dominikbrodowski.net: update to 2.6.31]
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-scsi@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
Acked-by: Karsten Keil <keil@b1-systems.de> (for ISDN)
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/pcmcia/fmvj18x_cs.c')
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 61726c82be46..6b9c79e4a2c0 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -574,7 +574,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) | |||
574 | base = ioremap(req.Base, req.Size); | 574 | base = ioremap(req.Base, req.Size); |
575 | mem.Page = 0; | 575 | mem.Page = 0; |
576 | mem.CardOffset = 0; | 576 | mem.CardOffset = 0; |
577 | pcmcia_map_mem_page(link->win, &mem); | 577 | pcmcia_map_mem_page(link, link->win, &mem); |
578 | 578 | ||
579 | /* | 579 | /* |
580 | * MBH10304 CISTPL_FUNCE_LAN_NODE_ID format | 580 | * MBH10304 CISTPL_FUNCE_LAN_NODE_ID format |
@@ -630,7 +630,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link) | |||
630 | 630 | ||
631 | mem.Page = 0; | 631 | mem.Page = 0; |
632 | mem.CardOffset = 0; | 632 | mem.CardOffset = 0; |
633 | i = pcmcia_map_mem_page(link->win, &mem); | 633 | i = pcmcia_map_mem_page(link, link->win, &mem); |
634 | if (i != 0) { | 634 | if (i != 0) { |
635 | iounmap(lp->base); | 635 | iounmap(lp->base); |
636 | lp->base = NULL; | 636 | lp->base = NULL; |