diff options
Diffstat (limited to 'drivers/isdn/hisax/elsa_cs.c')
-rw-r--r-- | drivers/isdn/hisax/elsa_cs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c index f276e8428960..368c8a213f0b 100644 --- a/drivers/isdn/hisax/elsa_cs.c +++ b/drivers/isdn/hisax/elsa_cs.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <asm/io.h> | 46 | #include <asm/io.h> |
47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
48 | 48 | ||
49 | #include <pcmcia/cs.h> | ||
50 | #include <pcmcia/cistpl.h> | 49 | #include <pcmcia/cistpl.h> |
51 | #include <pcmcia/cisreg.h> | 50 | #include <pcmcia/cisreg.h> |
52 | #include <pcmcia/ds.h> | 51 | #include <pcmcia/ds.h> |
@@ -129,8 +128,6 @@ static int __devinit elsa_cs_probe(struct pcmcia_device *link) | |||
129 | link->resource[0]->end = 8; | 128 | link->resource[0]->end = 8; |
130 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; | 129 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; |
131 | 130 | ||
132 | link->conf.Attributes = CONF_ENABLE_IRQ; | ||
133 | |||
134 | return elsa_cs_config(link); | 131 | return elsa_cs_config(link); |
135 | } /* elsa_cs_attach */ | 132 | } /* elsa_cs_attach */ |
136 | 133 | ||
@@ -205,15 +202,14 @@ static int __devinit elsa_cs_config(struct pcmcia_device *link) | |||
205 | if (!link->irq) | 202 | if (!link->irq) |
206 | goto failed; | 203 | goto failed; |
207 | 204 | ||
208 | i = pcmcia_request_configuration(link, &link->conf); | 205 | i = pcmcia_enable_device(link); |
209 | if (i != 0) | 206 | if (i != 0) |
210 | goto failed; | 207 | goto failed; |
211 | 208 | ||
212 | /* Finally, report what we've done */ | 209 | /* Finally, report what we've done */ |
213 | dev_info(&link->dev, "index 0x%02x: ", | 210 | dev_info(&link->dev, "index 0x%02x: ", |
214 | link->config_index); | 211 | link->config_index); |
215 | if (link->conf.Attributes & CONF_ENABLE_IRQ) | 212 | printk(", irq %d", link->irq); |
216 | printk(", irq %d", link->irq); | ||
217 | if (link->resource[0]) | 213 | if (link->resource[0]) |
218 | printk(" & %pR", link->resource[0]); | 214 | printk(" & %pR", link->resource[0]); |
219 | if (link->resource[1]) | 215 | if (link->resource[1]) |