diff options
Diffstat (limited to 'drivers/net/pcmcia/3c574_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 757f87bb1db3..14428317c009 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -283,8 +283,6 @@ static int tc574_probe(struct pcmcia_device *link) | |||
283 | spin_lock_init(&lp->window_lock); | 283 | spin_lock_init(&lp->window_lock); |
284 | link->io.NumPorts1 = 32; | 284 | link->io.NumPorts1 = 32; |
285 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; | 285 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; |
286 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | ||
287 | link->irq.Handler = &el3_interrupt; | ||
288 | link->conf.Attributes = CONF_ENABLE_IRQ; | 286 | link->conf.Attributes = CONF_ENABLE_IRQ; |
289 | link->conf.IntType = INT_MEMORY_AND_IO; | 287 | link->conf.IntType = INT_MEMORY_AND_IO; |
290 | link->conf.ConfigIndex = 1; | 288 | link->conf.ConfigIndex = 1; |
@@ -353,7 +351,7 @@ static int tc574_config(struct pcmcia_device *link) | |||
353 | if (i != 0) | 351 | if (i != 0) |
354 | goto failed; | 352 | goto failed; |
355 | 353 | ||
356 | ret = pcmcia_request_irq(link, &link->irq); | 354 | ret = pcmcia_request_irq(link, el3_interrupt); |
357 | if (ret) | 355 | if (ret) |
358 | goto failed; | 356 | goto failed; |
359 | 357 | ||
@@ -361,7 +359,7 @@ static int tc574_config(struct pcmcia_device *link) | |||
361 | if (ret) | 359 | if (ret) |
362 | goto failed; | 360 | goto failed; |
363 | 361 | ||
364 | dev->irq = link->irq.AssignedIRQ; | 362 | dev->irq = link->irq; |
365 | dev->base_addr = link->io.BasePort1; | 363 | dev->base_addr = link->io.BasePort1; |
366 | 364 | ||
367 | ioaddr = dev->base_addr; | 365 | ioaddr = dev->base_addr; |