diff options
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 81bafd578478..d431b59e7d11 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -270,7 +270,7 @@ static int try_io_port(struct pcmcia_device *link) | |||
270 | /* for master/slave multifunction cards */ | 270 | /* for master/slave multifunction cards */ |
271 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 271 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
272 | link->irq.Attributes = | 272 | link->irq.Attributes = |
273 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 273 | IRQ_TYPE_DYNAMIC_SHARING; |
274 | } | 274 | } |
275 | } else { | 275 | } else { |
276 | /* This should be two 16-port windows */ | 276 | /* This should be two 16-port windows */ |
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 8ad8384fc1c0..813aca3fc433 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -426,7 +426,7 @@ static int fmvj18x_config(struct pcmcia_device *link) | |||
426 | 426 | ||
427 | if (link->io.NumPorts2 != 0) { | 427 | if (link->io.NumPorts2 != 0) { |
428 | link->irq.Attributes = | 428 | link->irq.Attributes = |
429 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 429 | IRQ_TYPE_DYNAMIC_SHARING; |
430 | ret = mfc_try_io_port(link); | 430 | ret = mfc_try_io_port(link); |
431 | if (ret != 0) goto failed; | 431 | if (ret != 0) goto failed; |
432 | } else if (cardtype == UNGERMANN) { | 432 | } else if (cardtype == UNGERMANN) { |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 2d26b6ca28b9..92ed3fbf89a5 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -490,7 +490,7 @@ static int try_io_port(struct pcmcia_device *link) | |||
490 | /* for master/slave multifunction cards */ | 490 | /* for master/slave multifunction cards */ |
491 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 491 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
492 | link->irq.Attributes = | 492 | link->irq.Attributes = |
493 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 493 | IRQ_TYPE_DYNAMIC_SHARING; |
494 | } | 494 | } |
495 | } else { | 495 | } else { |
496 | /* This should be two 16-port windows */ | 496 | /* This should be two 16-port windows */ |
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index cc4853bc0253..6dd486d2977b 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -454,7 +454,7 @@ static int mhz_mfc_config(struct pcmcia_device *link) | |||
454 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 454 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
455 | link->conf.Status = CCSR_AUDIO_ENA; | 455 | link->conf.Status = CCSR_AUDIO_ENA; |
456 | link->irq.Attributes = | 456 | link->irq.Attributes = |
457 | IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; | 457 | IRQ_TYPE_DYNAMIC_SHARING; |
458 | link->io.IOAddrLines = 16; | 458 | link->io.IOAddrLines = 16; |
459 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 459 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
460 | link->io.NumPorts2 = 8; | 460 | link->io.NumPorts2 = 8; |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index a2eda28f903e..466fc72698c0 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -841,7 +841,7 @@ xirc2ps_config(struct pcmcia_device * link) | |||
841 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 841 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
842 | link->conf.Status |= CCSR_AUDIO_ENA; | 842 | link->conf.Status |= CCSR_AUDIO_ENA; |
843 | } | 843 | } |
844 | link->irq.Attributes |= IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED ; | 844 | link->irq.Attributes |= IRQ_TYPE_DYNAMIC_SHARING; |
845 | link->io.NumPorts2 = 8; | 845 | link->io.NumPorts2 = 8; |
846 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 846 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
847 | if (local->dingo) { | 847 | if (local->dingo) { |