diff options
Diffstat (limited to 'drivers/net/pcmcia/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 4d4928a22b1f..2c273ce6a5d8 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -230,7 +230,7 @@ static int get_prom(struct pcmcia_device *link) | |||
230 | }; | 230 | }; |
231 | 231 | ||
232 | /* Not much of a test, but the alternatives are messy */ | 232 | /* Not much of a test, but the alternatives are messy */ |
233 | if (link->conf.ConfigBase != 0x03c0) | 233 | if (link->config_base != 0x03c0) |
234 | return 0; | 234 | return 0; |
235 | 235 | ||
236 | axnet_reset_8390(dev); | 236 | axnet_reset_8390(dev); |
@@ -297,7 +297,7 @@ static int axnet_configcheck(struct pcmcia_device *p_dev, | |||
297 | if (cfg->index == 0 || cfg->io.nwin == 0) | 297 | if (cfg->index == 0 || cfg->io.nwin == 0) |
298 | return -ENODEV; | 298 | return -ENODEV; |
299 | 299 | ||
300 | p_dev->conf.ConfigIndex = 0x05; | 300 | p_dev->config_index = 0x05; |
301 | /* For multifunction cards, by convention, we configure the | 301 | /* For multifunction cards, by convention, we configure the |
302 | network function with window 0, and serial with window 1 */ | 302 | network function with window 0, and serial with window 1 */ |
303 | if (io->nwin > 1) { | 303 | if (io->nwin > 1) { |
@@ -325,7 +325,7 @@ static int axnet_config(struct pcmcia_device *link) | |||
325 | dev_dbg(&link->dev, "axnet_config(0x%p)\n", link); | 325 | dev_dbg(&link->dev, "axnet_config(0x%p)\n", link); |
326 | 326 | ||
327 | /* don't trust the CIS on this; Linksys got it wrong */ | 327 | /* don't trust the CIS on this; Linksys got it wrong */ |
328 | link->conf.Present = 0x63; | 328 | link->config_regs = 0x63; |
329 | ret = pcmcia_loop_config(link, axnet_configcheck, NULL); | 329 | ret = pcmcia_loop_config(link, axnet_configcheck, NULL); |
330 | if (ret != 0) | 330 | if (ret != 0) |
331 | goto failed; | 331 | goto failed; |