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/mtd | |
parent | 751382dd5cb2702368d281a50b55c2d6c4e8fbfc (diff) | |
parent | 7ac3db59fd4410405ce55e2a25c397aec440d8da (diff) |
Merge with rsync://fileserver/linux
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/maps/pcmciamtd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c index c2655a817e3d..ff7c50d10180 100644 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
19 | #include <asm/system.h> | 19 | #include <asm/system.h> |
20 | 20 | ||
21 | #include <pcmcia/version.h> | ||
22 | #include <pcmcia/cs_types.h> | 21 | #include <pcmcia/cs_types.h> |
23 | #include <pcmcia/cs.h> | 22 | #include <pcmcia/cs.h> |
24 | #include <pcmcia/cistpl.h> | 23 | #include <pcmcia/cistpl.h> |
@@ -800,11 +799,6 @@ static dev_link_t *pcmciamtd_attach(void) | |||
800 | 799 | ||
801 | /* Register with Card Services */ | 800 | /* Register with Card Services */ |
802 | client_reg.dev_info = &dev_info; | 801 | client_reg.dev_info = &dev_info; |
803 | client_reg.EventMask = | ||
804 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
805 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
806 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
807 | client_reg.event_handler = &pcmciamtd_event; | ||
808 | client_reg.Version = 0x0210; | 802 | client_reg.Version = 0x0210; |
809 | client_reg.event_callback_args.client_data = link; | 803 | client_reg.event_callback_args.client_data = link; |
810 | DEBUG(2, "Calling RegisterClient"); | 804 | DEBUG(2, "Calling RegisterClient"); |
@@ -850,6 +844,7 @@ static struct pcmcia_driver pcmciamtd_driver = { | |||
850 | .name = "pcmciamtd" | 844 | .name = "pcmciamtd" |
851 | }, | 845 | }, |
852 | .attach = pcmciamtd_attach, | 846 | .attach = pcmciamtd_attach, |
847 | .event = pcmciamtd_event, | ||
853 | .detach = pcmciamtd_detach, | 848 | .detach = pcmciamtd_detach, |
854 | .owner = THIS_MODULE, | 849 | .owner = THIS_MODULE, |
855 | .id_table = pcmciamtd_ids, | 850 | .id_table = pcmciamtd_ids, |