diff options
| author | Jeff Garzik | 2005-07-14 01:11:44 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2005-07-14 01:11:44 +0200 |
| commit | 08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch) | |
| tree | 6fdb546c151410851fd3c604d42590afa4215084 /drivers/net/wireless/wavelan_cs.c | |
| parent | Merge /spare/repo/netdev-2.6 branch 'ieee80211' (diff) | |
| parent | Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff) | |
| download | kernel-qcow2-linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.gz kernel-qcow2-linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.xz kernel-qcow2-linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.zip | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/net/wireless/wavelan_cs.c')
| -rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index fe54571bc121..183c4732ef65 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c @@ -4690,12 +4690,6 @@ wavelan_attach(void) /* Register with Card Services */ client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_REGISTRATION_COMPLETE | - 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 = &wavelan_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -4910,6 +4904,7 @@ static struct pcmcia_driver wavelan_driver = { .name = "wavelan_cs", }, .attach = wavelan_attach, + .event = wavelan_event, .detach = wavelan_detach, .id_table = wavelan_ids, }; |