diff options
Diffstat (limited to 'drivers/bluetooth/bluecard_cs.c')
-rw-r--r-- | drivers/bluetooth/bluecard_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 08f4818ad9f7..c9dd5b789d25 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <linux/skbuff.h> | 39 | #include <linux/skbuff.h> |
40 | #include <linux/io.h> | 40 | #include <linux/io.h> |
41 | 41 | ||
42 | #include <pcmcia/cs.h> | ||
43 | #include <pcmcia/cistpl.h> | 42 | #include <pcmcia/cistpl.h> |
44 | #include <pcmcia/ciscode.h> | 43 | #include <pcmcia/ciscode.h> |
45 | #include <pcmcia/ds.h> | 44 | #include <pcmcia/ds.h> |
@@ -865,7 +864,7 @@ static int bluecard_probe(struct pcmcia_device *link) | |||
865 | info->p_dev = link; | 864 | info->p_dev = link; |
866 | link->priv = info; | 865 | link->priv = info; |
867 | 866 | ||
868 | link->conf.Attributes = CONF_ENABLE_IRQ; | 867 | link->config_flags |= CONF_ENABLE_IRQ; |
869 | 868 | ||
870 | return bluecard_config(link); | 869 | return bluecard_config(link); |
871 | } | 870 | } |
@@ -905,7 +904,7 @@ static int bluecard_config(struct pcmcia_device *link) | |||
905 | if (i != 0) | 904 | if (i != 0) |
906 | goto failed; | 905 | goto failed; |
907 | 906 | ||
908 | i = pcmcia_request_configuration(link, &link->conf); | 907 | i = pcmcia_enable_device(link); |
909 | if (i != 0) | 908 | if (i != 0) |
910 | goto failed; | 909 | goto failed; |
911 | 910 | ||