aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJouni Malinen <jkmaline@cc.hut.fi>2005-07-30 12:49:55 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-07-30 18:17:22 -0400
commit47e362cf6942de8b3a227929bf8bab578d92ad49 (patch)
tree80072940762e0b471eed05fcbdd6502e57d97678 /drivers/net
parentde745fb27983770ebfdeaa70f8a36f791fb33786 (diff)
[PATCH] hostap update
Update hostap_cs to use new PCMCIA event callback registration. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index e66c797bdc8..3ca52e7aea1 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -1,7 +1,6 @@
#define PRISM2_PCCARD
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/if.h>
@@ -13,7 +12,6 @@
#include <linux/wireless.h>
#include <net/iw_handler.h>
-#include <pcmcia/version.h>
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/cistpl.h>
@@ -532,12 +530,6 @@ static dev_link_t *prism2_attach(void)
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT;
- 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 = &prism2_event;
client_reg.Version = 0x0210;
client_reg.event_callback_args.client_data = link;
ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -931,6 +923,7 @@ static struct pcmcia_driver hostap_driver = {
.attach = prism2_attach,
.detach = prism2_detach,
.owner = THIS_MODULE,
+ .event = prism2_event,
};
static int __init init_prism2_pccard(void)