diff options
Diffstat (limited to 'drivers/net/pcmcia/xirc2ps_cs.c')
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 0cd225e1595..9f33bad174e 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -81,7 +81,6 @@ | |||
81 | #include <linux/ioport.h> | 81 | #include <linux/ioport.h> |
82 | #include <linux/bitops.h> | 82 | #include <linux/bitops.h> |
83 | 83 | ||
84 | #include <pcmcia/version.h> | ||
85 | #include <pcmcia/cs_types.h> | 84 | #include <pcmcia/cs_types.h> |
86 | #include <pcmcia/cs.h> | 85 | #include <pcmcia/cs.h> |
87 | #include <pcmcia/cistpl.h> | 86 | #include <pcmcia/cistpl.h> |
@@ -619,11 +618,6 @@ xirc2ps_attach(void) | |||
619 | link->next = dev_list; | 618 | link->next = dev_list; |
620 | dev_list = link; | 619 | dev_list = link; |
621 | client_reg.dev_info = &dev_info; | 620 | client_reg.dev_info = &dev_info; |
622 | client_reg.EventMask = | ||
623 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
624 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
625 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
626 | client_reg.event_handler = &xirc2ps_event; | ||
627 | client_reg.Version = 0x0210; | 621 | client_reg.Version = 0x0210; |
628 | client_reg.event_callback_args.client_data = link; | 622 | client_reg.event_callback_args.client_data = link; |
629 | if ((err = pcmcia_register_client(&link->handle, &client_reg))) { | 623 | if ((err = pcmcia_register_client(&link->handle, &client_reg))) { |
@@ -2016,6 +2010,7 @@ static struct pcmcia_driver xirc2ps_cs_driver = { | |||
2016 | .name = "xirc2ps_cs", | 2010 | .name = "xirc2ps_cs", |
2017 | }, | 2011 | }, |
2018 | .attach = xirc2ps_attach, | 2012 | .attach = xirc2ps_attach, |
2013 | .event = xirc2ps_event, | ||
2019 | .detach = xirc2ps_detach, | 2014 | .detach = xirc2ps_detach, |
2020 | .id_table = xirc2ps_ids, | 2015 | .id_table = xirc2ps_ids, |
2021 | }; | 2016 | }; |