diff options
Diffstat (limited to 'drivers/bluetooth/dtl1_cs.c')
-rw-r--r-- | drivers/bluetooth/dtl1_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index b4c9a2e0a96b..38206df7206b 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <asm/system.h> | 41 | #include <asm/system.h> |
42 | #include <asm/io.h> | 42 | #include <asm/io.h> |
43 | 43 | ||
44 | #include <pcmcia/cs.h> | ||
45 | #include <pcmcia/cistpl.h> | 44 | #include <pcmcia/cistpl.h> |
46 | #include <pcmcia/ciscode.h> | 45 | #include <pcmcia/ciscode.h> |
47 | #include <pcmcia/ds.h> | 46 | #include <pcmcia/ds.h> |
@@ -575,7 +574,7 @@ static int dtl1_probe(struct pcmcia_device *link) | |||
575 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; | 574 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; |
576 | link->resource[0]->end = 8; | 575 | link->resource[0]->end = 8; |
577 | 576 | ||
578 | link->conf.Attributes = CONF_ENABLE_IRQ; | 577 | link->config_flags |= CONF_ENABLE_IRQ; |
579 | 578 | ||
580 | return dtl1_config(link); | 579 | return dtl1_config(link); |
581 | } | 580 | } |
@@ -619,7 +618,7 @@ static int dtl1_config(struct pcmcia_device *link) | |||
619 | if (i != 0) | 618 | if (i != 0) |
620 | goto failed; | 619 | goto failed; |
621 | 620 | ||
622 | i = pcmcia_request_configuration(link, &link->conf); | 621 | i = pcmcia_enable_device(link); |
623 | if (i != 0) | 622 | if (i != 0) |
624 | goto failed; | 623 | goto failed; |
625 | 624 | ||