aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ray_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
-rw-r--r--drivers/net/wireless/ray_cs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 7fb66cc1e9fd..1457f34efa9a 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -46,7 +46,6 @@
46#include <linux/ethtool.h> 46#include <linux/ethtool.h>
47#include <linux/ieee80211.h> 47#include <linux/ieee80211.h>
48 48
49#include <pcmcia/cs.h>
50#include <pcmcia/cistpl.h> 49#include <pcmcia/cistpl.h>
51#include <pcmcia/cisreg.h> 50#include <pcmcia/cisreg.h>
52#include <pcmcia/ds.h> 51#include <pcmcia/ds.h>
@@ -318,7 +317,7 @@ static int ray_probe(struct pcmcia_device *p_dev)
318 p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; 317 p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
319 318
320 /* General socket configuration */ 319 /* General socket configuration */
321 p_dev->conf.Attributes = CONF_ENABLE_IRQ; 320 p_dev->config_flags |= CONF_ENABLE_IRQ;
322 p_dev->config_index = 1; 321 p_dev->config_index = 1;
323 322
324 p_dev->priv = dev; 323 p_dev->priv = dev;
@@ -413,7 +412,7 @@ static int ray_config(struct pcmcia_device *link)
413 /* This actually configures the PCMCIA socket -- setting up 412 /* This actually configures the PCMCIA socket -- setting up
414 the I/O windows and the interrupt mapping. 413 the I/O windows and the interrupt mapping.
415 */ 414 */
416 ret = pcmcia_request_configuration(link, &link->conf); 415 ret = pcmcia_enable_device(link);
417 if (ret) 416 if (ret)
418 goto failed; 417 goto failed;
419 418