diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-cs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c index 07e37876559c..87ad04925a9f 100644 --- a/drivers/ide/ide-cs.c +++ b/drivers/ide/ide-cs.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <asm/io.h> | 43 | #include <asm/io.h> |
44 | #include <asm/system.h> | 44 | #include <asm/system.h> |
45 | 45 | ||
46 | #include <pcmcia/cs.h> | ||
47 | #include <pcmcia/cistpl.h> | 46 | #include <pcmcia/cistpl.h> |
48 | #include <pcmcia/ds.h> | 47 | #include <pcmcia/ds.h> |
49 | #include <pcmcia/cisreg.h> | 48 | #include <pcmcia/cisreg.h> |
@@ -99,7 +98,7 @@ static int ide_probe(struct pcmcia_device *link) | |||
99 | 98 | ||
100 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; | 99 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; |
101 | link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8; | 100 | link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8; |
102 | link->conf.Attributes = CONF_ENABLE_IRQ; | 101 | link->config_flags |= CONF_ENABLE_IRQ; |
103 | 102 | ||
104 | return ide_config(link); | 103 | return ide_config(link); |
105 | } /* ide_attach */ | 104 | } /* ide_attach */ |
@@ -284,7 +283,8 @@ static int ide_config(struct pcmcia_device *link) | |||
284 | 283 | ||
285 | if (!link->irq) | 284 | if (!link->irq) |
286 | goto failed; | 285 | goto failed; |
287 | ret = pcmcia_request_configuration(link, &link->conf); | 286 | |
287 | ret = pcmcia_enable_device(link); | ||
288 | if (ret) | 288 | if (ret) |
289 | goto failed; | 289 | goto failed; |
290 | 290 | ||