diff options
Diffstat (limited to 'drivers/net/pcmcia/ibmtr_cs.c')
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index feedeeb17a52..b298a3d98dc8 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #include <linux/trdevice.h> | 57 | #include <linux/trdevice.h> |
58 | #include <linux/ibmtr.h> | 58 | #include <linux/ibmtr.h> |
59 | 59 | ||
60 | #include <pcmcia/cs.h> | ||
61 | #include <pcmcia/cistpl.h> | 60 | #include <pcmcia/cistpl.h> |
62 | #include <pcmcia/ds.h> | 61 | #include <pcmcia/ds.h> |
63 | 62 | ||
@@ -152,7 +151,7 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link) | |||
152 | 151 | ||
153 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; | 152 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; |
154 | link->resource[0]->end = 4; | 153 | link->resource[0]->end = 4; |
155 | link->conf.Attributes = CONF_ENABLE_IRQ; | 154 | link->config_flags |= CONF_ENABLE_IRQ; |
156 | link->config_regs = PRESENT_OPTION; | 155 | link->config_regs = PRESENT_OPTION; |
157 | 156 | ||
158 | info->dev = dev; | 157 | info->dev = dev; |
@@ -269,7 +268,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
269 | resource_size(link->resource[3])); | 268 | resource_size(link->resource[3])); |
270 | ti->sram_phys = link->resource[3]->start; | 269 | ti->sram_phys = link->resource[3]->start; |
271 | 270 | ||
272 | ret = pcmcia_request_configuration(link, &link->conf); | 271 | ret = pcmcia_enable_device(link); |
273 | if (ret) | 272 | if (ret) |
274 | goto failed; | 273 | goto failed; |
275 | 274 | ||