diff options
Diffstat (limited to 'drivers/char/pcmcia/cm4040_cs.c')
-rw-r--r-- | drivers/char/pcmcia/cm4040_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index a32eba0afdfc..0c87b80bf641 100644 --- a/drivers/char/pcmcia/cm4040_cs.c +++ b/drivers/char/pcmcia/cm4040_cs.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
31 | 31 | ||
32 | #include <pcmcia/cs.h> | ||
33 | #include <pcmcia/cistpl.h> | 32 | #include <pcmcia/cistpl.h> |
34 | #include <pcmcia/cisreg.h> | 33 | #include <pcmcia/cisreg.h> |
35 | #include <pcmcia/ciscode.h> | 34 | #include <pcmcia/ciscode.h> |
@@ -547,10 +546,10 @@ static int reader_config(struct pcmcia_device *link, int devno) | |||
547 | if (pcmcia_loop_config(link, cm4040_config_check, NULL)) | 546 | if (pcmcia_loop_config(link, cm4040_config_check, NULL)) |
548 | goto cs_release; | 547 | goto cs_release; |
549 | 548 | ||
550 | fail_rc = pcmcia_request_configuration(link, &link->conf); | 549 | fail_rc = pcmcia_enable_device(link); |
551 | if (fail_rc != 0) { | 550 | if (fail_rc != 0) { |
552 | dev_printk(KERN_INFO, &link->dev, | 551 | dev_printk(KERN_INFO, &link->dev, |
553 | "pcmcia_request_configuration failed 0x%x\n", | 552 | "pcmcia_enable_device failed 0x%x\n", |
554 | fail_rc); | 553 | fail_rc); |
555 | goto cs_release; | 554 | goto cs_release; |
556 | } | 555 | } |