diff options
Diffstat (limited to 'drivers/net/pcmcia/fmvj18x_cs.c')
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 9b5ca37c6684..6e3e1ced6db4 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -255,10 +255,8 @@ static int fmvj18x_probe(struct pcmcia_device *link) | |||
255 | link->io.IOAddrLines = 5; | 255 | link->io.IOAddrLines = 5; |
256 | 256 | ||
257 | /* Interrupt setup */ | 257 | /* Interrupt setup */ |
258 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT; | 258 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
259 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
260 | link->irq.Handler = &fjn_interrupt; | 259 | link->irq.Handler = &fjn_interrupt; |
261 | link->irq.Instance = dev; | ||
262 | 260 | ||
263 | /* General socket configuration */ | 261 | /* General socket configuration */ |
264 | link->conf.Attributes = CONF_ENABLE_IRQ; | 262 | link->conf.Attributes = CONF_ENABLE_IRQ; |
@@ -428,7 +426,7 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
428 | 426 | ||
429 | if (link->io.NumPorts2 != 0) { | 427 | if (link->io.NumPorts2 != 0) { |
430 | link->irq.Attributes = | 428 | link->irq.Attributes = |
431 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT; | 429 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; |
432 | ret = mfc_try_io_port(link); | 430 | ret = mfc_try_io_port(link); |
433 | if (ret != 0) goto failed; | 431 | if (ret != 0) goto failed; |
434 | } else if (cardtype == UNGERMANN) { | 432 | } else if (cardtype == UNGERMANN) { |