diff options
author | Todd Poynor <tpoynor@mvista.com> | 2005-07-11 22:34:39 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-12 18:58:44 -0400 |
commit | a98a5d04f400ad112e59cadd739dbabf89417e60 (patch) | |
tree | 5eeb7f45c0090de40c7523e2b9dfd5e86b22169e /drivers/isdn/hisax/avma1_cs.c | |
parent | 751382dd5cb2702368d281a50b55c2d6c4e8fbfc (diff) | |
parent | 7ac3db59fd4410405ce55e2a25c397aec440d8da (diff) |
Merge with rsync://fileserver/linux
Diffstat (limited to 'drivers/isdn/hisax/avma1_cs.c')
-rw-r--r-- | drivers/isdn/hisax/avma1_cs.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c index 67c60e04a37b..0e22991635e7 100644 --- a/drivers/isdn/hisax/avma1_cs.c +++ b/drivers/isdn/hisax/avma1_cs.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #include <asm/system.h> | 22 | #include <asm/system.h> |
23 | 23 | ||
24 | #include <pcmcia/version.h> | ||
25 | #include <pcmcia/cs_types.h> | 24 | #include <pcmcia/cs_types.h> |
26 | #include <pcmcia/cs.h> | 25 | #include <pcmcia/cs.h> |
27 | #include <pcmcia/cistpl.h> | 26 | #include <pcmcia/cistpl.h> |
@@ -183,11 +182,6 @@ static dev_link_t *avma1cs_attach(void) | |||
183 | link->next = dev_list; | 182 | link->next = dev_list; |
184 | dev_list = link; | 183 | dev_list = link; |
185 | client_reg.dev_info = &dev_info; | 184 | client_reg.dev_info = &dev_info; |
186 | client_reg.EventMask = | ||
187 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
188 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
189 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
190 | client_reg.event_handler = &avma1cs_event; | ||
191 | client_reg.Version = 0x0210; | 185 | client_reg.Version = 0x0210; |
192 | client_reg.event_callback_args.client_data = link; | 186 | client_reg.event_callback_args.client_data = link; |
193 | ret = pcmcia_register_client(&link->handle, &client_reg); | 187 | ret = pcmcia_register_client(&link->handle, &client_reg); |
@@ -514,6 +508,7 @@ static struct pcmcia_driver avma1cs_driver = { | |||
514 | .name = "avma1_cs", | 508 | .name = "avma1_cs", |
515 | }, | 509 | }, |
516 | .attach = avma1cs_attach, | 510 | .attach = avma1cs_attach, |
511 | .event = avma1cs_event, | ||
517 | .detach = avma1cs_detach, | 512 | .detach = avma1cs_detach, |
518 | .id_table = avma1cs_ids, | 513 | .id_table = avma1cs_ids, |
519 | }; | 514 | }; |