diff options
| author | Tony Luck | 2005-07-08 08:52:42 -0700 |
|---|---|---|
| committer | Tony Luck | 2005-07-08 08:52:42 -0700 |
| commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
| tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /drivers/net/wireless/ray_cs.c | |
| parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
| parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) | |
Auto merge with /home/aegl/GIT/linus
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 @@ #include <linux/skbuff.h> #include <linux/ethtool.h> -#include <pcmcia/version.h> #include <pcmcia/cs_types.h> #include <pcmcia/cs.h> #include <pcmcia/cistpl.h> @@ -393,11 +392,6 @@ static dev_link_t *ray_attach(void) link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &ray_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -2916,6 +2910,7 @@ static struct pcmcia_driver ray_driver = { .name = "ray_cs", }, .attach = ray_attach, + .event = ray_event, .detach = ray_detach, .id_table = ray_ids, }; |