diff options
Diffstat (limited to 'drivers/net/pcmcia/nmclan_cs.c')
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 98c4a6976045..51bf76de6499 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -146,7 +146,6 @@ Include Files | |||
146 | #include <linux/ioport.h> | 146 | #include <linux/ioport.h> |
147 | #include <linux/bitops.h> | 147 | #include <linux/bitops.h> |
148 | 148 | ||
149 | #include <pcmcia/cs.h> | ||
150 | #include <pcmcia/cisreg.h> | 149 | #include <pcmcia/cisreg.h> |
151 | #include <pcmcia/cistpl.h> | 150 | #include <pcmcia/cistpl.h> |
152 | #include <pcmcia/ds.h> | 151 | #include <pcmcia/ds.h> |
@@ -460,7 +459,7 @@ static int nmclan_probe(struct pcmcia_device *link) | |||
460 | spin_lock_init(&lp->bank_lock); | 459 | spin_lock_init(&lp->bank_lock); |
461 | link->resource[0]->end = 32; | 460 | link->resource[0]->end = 32; |
462 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; | 461 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; |
463 | link->conf.Attributes = CONF_ENABLE_IRQ; | 462 | link->config_flags |= CONF_ENABLE_IRQ; |
464 | link->config_index = 1; | 463 | link->config_index = 1; |
465 | link->config_regs = PRESENT_OPTION; | 464 | link->config_regs = PRESENT_OPTION; |
466 | 465 | ||
@@ -649,7 +648,7 @@ static int nmclan_config(struct pcmcia_device *link) | |||
649 | ret = pcmcia_request_exclusive_irq(link, mace_interrupt); | 648 | ret = pcmcia_request_exclusive_irq(link, mace_interrupt); |
650 | if (ret) | 649 | if (ret) |
651 | goto failed; | 650 | goto failed; |
652 | ret = pcmcia_request_configuration(link, &link->conf); | 651 | ret = pcmcia_enable_device(link); |
653 | if (ret) | 652 | if (ret) |
654 | goto failed; | 653 | goto failed; |
655 | 654 | ||