diff options
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 31652af52eac..0e0ba614259a 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <linux/skbuff.h> | 46 | #include <linux/skbuff.h> |
47 | #include <linux/ethtool.h> | 47 | #include <linux/ethtool.h> |
48 | 48 | ||
49 | #include <pcmcia/version.h> | ||
50 | #include <pcmcia/cs_types.h> | 49 | #include <pcmcia/cs_types.h> |
51 | #include <pcmcia/cs.h> | 50 | #include <pcmcia/cs.h> |
52 | #include <pcmcia/cistpl.h> | 51 | #include <pcmcia/cistpl.h> |
@@ -393,11 +392,6 @@ static dev_link_t *ray_attach(void) | |||
393 | link->next = dev_list; | 392 | link->next = dev_list; |
394 | dev_list = link; | 393 | dev_list = link; |
395 | client_reg.dev_info = &dev_info; | 394 | client_reg.dev_info = &dev_info; |
396 | client_reg.EventMask = | ||
397 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
398 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
399 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
400 | client_reg.event_handler = &ray_event; | ||
401 | client_reg.Version = 0x0210; | 395 | client_reg.Version = 0x0210; |
402 | client_reg.event_callback_args.client_data = link; | 396 | client_reg.event_callback_args.client_data = link; |
403 | 397 | ||
@@ -2916,6 +2910,7 @@ static struct pcmcia_driver ray_driver = { | |||
2916 | .name = "ray_cs", | 2910 | .name = "ray_cs", |
2917 | }, | 2911 | }, |
2918 | .attach = ray_attach, | 2912 | .attach = ray_attach, |
2913 | .event = ray_event, | ||
2919 | .detach = ray_detach, | 2914 | .detach = ray_detach, |
2920 | .id_table = ray_ids, | 2915 | .id_table = ray_ids, |
2921 | }; | 2916 | }; |