aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/3c589_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/3c589_cs.c')
-rw-r--r--drivers/net/pcmcia/3c589_cs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 6549e2c496a0..34195c407fb2 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -41,7 +41,6 @@
41#include <linux/bitops.h> 41#include <linux/bitops.h>
42#include <linux/jiffies.h> 42#include <linux/jiffies.h>
43 43
44#include <pcmcia/cs.h>
45#include <pcmcia/cistpl.h> 44#include <pcmcia/cistpl.h>
46#include <pcmcia/cisreg.h> 45#include <pcmcia/cisreg.h>
47#include <pcmcia/ciscode.h> 46#include <pcmcia/ciscode.h>
@@ -216,7 +215,7 @@ static int tc589_probe(struct pcmcia_device *link)
216 link->resource[0]->end = 16; 215 link->resource[0]->end = 16;
217 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16; 216 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
218 217
219 link->conf.Attributes = CONF_ENABLE_IRQ; 218 link->config_flags |= CONF_ENABLE_IRQ;
220 link->config_index = 1; 219 link->config_index = 1;
221 220
222 dev->netdev_ops = &el3_netdev_ops; 221 dev->netdev_ops = &el3_netdev_ops;
@@ -293,7 +292,7 @@ static int tc589_config(struct pcmcia_device *link)
293 if (ret) 292 if (ret)
294 goto failed; 293 goto failed;
295 294
296 ret = pcmcia_request_configuration(link, &link->conf); 295 ret = pcmcia_enable_device(link);
297 if (ret) 296 if (ret)
298 goto failed; 297 goto failed;
299 298