diff options
| author | Todd Poynor <tpoynor@mvista.com> | 2005-07-12 03:34:39 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-13 00:58:44 +0200 |
| commit | a98a5d04f400ad112e59cadd739dbabf89417e60 (patch) | |
| tree | 5eeb7f45c0090de40c7523e2b9dfd5e86b22169e /drivers/mtd | |
| parent | 751382dd5cb2702368d281a50b55c2d6c4e8fbfc (diff) | |
| parent | 7ac3db59fd4410405ce55e2a25c397aec440d8da (diff) | |
| download | kernel-crypto-a98a5d04f400ad112e59cadd739dbabf89417e60.tar.gz kernel-crypto-a98a5d04f400ad112e59cadd739dbabf89417e60.tar.xz kernel-crypto-a98a5d04f400ad112e59cadd739dbabf89417e60.zip | |
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 c2655a817e3..ff7c50d1018 100644 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c @@ -18,7 +18,6 @@ #include <asm/io.h> #include <asm/system.h> -#include <pcmcia/version.h> #include <pcmcia/cs_types.h> #include <pcmcia/cs.h> #include <pcmcia/cistpl.h> @@ -800,11 +799,6 @@ static dev_link_t *pcmciamtd_attach(void) /* Register with Card Services */ client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &pcmciamtd_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; DEBUG(2, "Calling RegisterClient"); @@ -850,6 +844,7 @@ static struct pcmcia_driver pcmciamtd_driver = { .name = "pcmciamtd" }, .attach = pcmciamtd_attach, + .event = pcmciamtd_event, .detach = pcmciamtd_detach, .owner = THIS_MODULE, .id_table = pcmciamtd_ids, |