Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index c479484a1f7f..e4c59fdc0e12 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -43,7 +43,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -615,11 +614,6 @@ static dev_link_t *btuart_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 = &btuart_event;
         client_reg.Version = 0x0210;
         client_reg.event_callback_args.client_data = link;
 
@@ -867,6 +861,7 @@ static struct pcmcia_driver btuart_driver = {
                 .name   = "btuart_cs",
         },
         .attach         = btuart_attach,
+        .event          = btuart_event,
         .detach         = btuart_detach,
         .id_table       = btuart_ids,
 };