aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/pcnet_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/pcnet_cs.c')
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index db6dbdabb702..c9cd2377ef91 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -554,7 +554,7 @@ static int pcnet_config(struct pcmcia_device *link)
554 if (!link->irq) 554 if (!link->irq)
555 goto failed; 555 goto failed;
556 556
557 if (link->io.NumPorts2 == 8) { 557 if (resource_size(link->resource[1]) == 8) {
558 link->conf.Attributes |= CONF_ENABLE_SPKR; 558 link->conf.Attributes |= CONF_ENABLE_SPKR;
559 link->conf.Status = CCSR_AUDIO_ENA; 559 link->conf.Status = CCSR_AUDIO_ENA;
560 } 560 }
@@ -566,7 +566,7 @@ static int pcnet_config(struct pcmcia_device *link)
566 if (ret) 566 if (ret)
567 goto failed; 567 goto failed;
568 dev->irq = link->irq; 568 dev->irq = link->irq;
569 dev->base_addr = link->io.BasePort1; 569 dev->base_addr = link->resource[0]->start;
570 if (info->flags & HAS_MISC_REG) { 570 if (info->flags & HAS_MISC_REG) {
571 if ((if_port == 1) || (if_port == 2)) 571 if ((if_port == 1) || (if_port == 2))
572 dev->if_port = if_port; 572 dev->if_port = if_port;