diff options
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index 8faf634987e3..63b3d3c18c34 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -48,7 +48,6 @@ | |||
48 | #include <linux/parport.h> | 48 | #include <linux/parport.h> |
49 | #include <linux/parport_pc.h> | 49 | #include <linux/parport_pc.h> |
50 | 50 | ||
51 | #include <pcmcia/cs.h> | ||
52 | #include <pcmcia/cistpl.h> | 51 | #include <pcmcia/cistpl.h> |
53 | #include <pcmcia/ds.h> | 52 | #include <pcmcia/ds.h> |
54 | #include <pcmcia/cisreg.h> | 53 | #include <pcmcia/cisreg.h> |
@@ -103,7 +102,7 @@ static int parport_probe(struct pcmcia_device *link) | |||
103 | 102 | ||
104 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; | 103 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; |
105 | link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8; | 104 | link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8; |
106 | link->conf.Attributes = CONF_ENABLE_IRQ; | 105 | link->config_flags |= CONF_ENABLE_IRQ; |
107 | 106 | ||
108 | return parport_config(link); | 107 | return parport_config(link); |
109 | } /* parport_attach */ | 108 | } /* parport_attach */ |
@@ -172,7 +171,7 @@ static int parport_config(struct pcmcia_device *link) | |||
172 | 171 | ||
173 | if (!link->irq) | 172 | if (!link->irq) |
174 | goto failed; | 173 | goto failed; |
175 | ret = pcmcia_request_configuration(link, &link->conf); | 174 | ret = pcmcia_enable_device(link); |
176 | if (ret) | 175 | if (ret) |
177 | goto failed; | 176 | goto failed; |
178 | 177 | ||