diff options
Diffstat (limited to 'drivers/net/pcmcia/3c589_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 122ef4a9488c..61f9cf2100ff 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -213,8 +213,8 @@ static int tc589_probe(struct pcmcia_device *link) | |||
213 | lp->p_dev = link; | 213 | lp->p_dev = link; |
214 | 214 | ||
215 | spin_lock_init(&lp->lock); | 215 | spin_lock_init(&lp->lock); |
216 | link->io.NumPorts1 = 16; | 216 | link->resource[0]->end = 16; |
217 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | 217 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16; |
218 | 218 | ||
219 | link->conf.Attributes = CONF_ENABLE_IRQ; | 219 | link->conf.Attributes = CONF_ENABLE_IRQ; |
220 | link->conf.IntType = INT_MEMORY_AND_IO; | 220 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -277,12 +277,13 @@ static int tc589_config(struct pcmcia_device *link) | |||
277 | "3Com card??\n"); | 277 | "3Com card??\n"); |
278 | multi = (link->card_id == PRODID_3COM_3C562); | 278 | multi = (link->card_id == PRODID_3COM_3C562); |
279 | 279 | ||
280 | link->io_lines = 16; | ||
281 | |||
280 | /* For the 3c562, the base address must be xx00-xx7f */ | 282 | /* For the 3c562, the base address must be xx00-xx7f */ |
281 | link->io.IOAddrLines = 16; | ||
282 | for (i = j = 0; j < 0x400; j += 0x10) { | 283 | for (i = j = 0; j < 0x400; j += 0x10) { |
283 | if (multi && (j & 0x80)) continue; | 284 | if (multi && (j & 0x80)) continue; |
284 | link->io.BasePort1 = j ^ 0x300; | 285 | link->resource[0]->start = j ^ 0x300; |
285 | i = pcmcia_request_io(link, &link->io); | 286 | i = pcmcia_request_io(link); |
286 | if (i == 0) | 287 | if (i == 0) |
287 | break; | 288 | break; |
288 | } | 289 | } |