diff options
Diffstat (limited to 'drivers/bluetooth/bt3c_cs.c')
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index fb018073a5f8..3db95887cfd7 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include <linux/device.h> | 45 | #include <linux/device.h> |
46 | #include <linux/firmware.h> | 46 | #include <linux/firmware.h> |
47 | 47 | ||
48 | #include <pcmcia/cs.h> | ||
49 | #include <pcmcia/cistpl.h> | 48 | #include <pcmcia/cistpl.h> |
50 | #include <pcmcia/ciscode.h> | 49 | #include <pcmcia/ciscode.h> |
51 | #include <pcmcia/ds.h> | 50 | #include <pcmcia/ds.h> |
@@ -660,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link) | |||
660 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; | 659 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; |
661 | link->resource[0]->end = 8; | 660 | link->resource[0]->end = 8; |
662 | 661 | ||
663 | link->conf.Attributes = CONF_ENABLE_IRQ; | 662 | link->config_flags |= CONF_ENABLE_IRQ; |
664 | 663 | ||
665 | return bt3c_config(link); | 664 | return bt3c_config(link); |
666 | } | 665 | } |
@@ -741,7 +740,7 @@ found_port: | |||
741 | if (i != 0) | 740 | if (i != 0) |
742 | goto failed; | 741 | goto failed; |
743 | 742 | ||
744 | i = pcmcia_request_configuration(link, &link->conf); | 743 | i = pcmcia_enable_device(link); |
745 | if (i != 0) | 744 | if (i != 0) |
746 | goto failed; | 745 | goto failed; |
747 | 746 | ||