4 files changed, 8 insertions, 12 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 @@
 #include <linux/skbuff.h>
 #include <linux/io.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
 #include <pcmcia/ds.h>
@@ -865,7 +864,7 @@ static int bluecard_probe(struct pcmcia_device *link)
         info->p_dev = link;
         link->priv = info;
 
-        link->conf.Attributes = CONF_ENABLE_IRQ;
+        link->config_flags |= CONF_ENABLE_IRQ;
 
         return bluecard_config(link);
 }
@@ -905,7 +904,7 @@ static int bluecard_config(struct pcmcia_device *link)
         if (i != 0)
                 goto failed;
 
-        i = pcmcia_request_configuration(link, &link->conf);
+        i = pcmcia_enable_device(link);
         if (i != 0)
                 goto failed;
 
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 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
 #include <pcmcia/ds.h>
@@ -660,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link)
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
         link->resource[0]->end = 8;
 
-        link->conf.Attributes = CONF_ENABLE_IRQ;
+        link->config_flags |= CONF_ENABLE_IRQ;
 
         return bt3c_config(link);
 }
@@ -741,7 +740,7 @@ found_port:
         if (i != 0)
                 goto failed;
 
-        i = pcmcia_request_configuration(link, &link->conf);
+        i = pcmcia_enable_device(link);
         if (i != 0)
                 goto failed;
 
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 897c7c74ca14..c5c43594ae0e 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -41,7 +41,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
 #include <pcmcia/ds.h>
@@ -589,7 +588,7 @@ static int btuart_probe(struct pcmcia_device *link)
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
         link->resource[0]->end = 8;
 
-        link->conf.Attributes = CONF_ENABLE_IRQ;
+        link->config_flags |= CONF_ENABLE_IRQ;
 
         return btuart_config(link);
 }
@@ -670,7 +669,7 @@ found_port:
         if (i != 0)
                 goto failed;
 
-        i = pcmcia_request_configuration(link, &link->conf);
+        i = pcmcia_enable_device(link);
         if (i != 0)
                 goto failed;
 
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 @@
 #include <asm/system.h>
 #include <asm/io.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
 #include <pcmcia/ds.h>
@@ -575,7 +574,7 @@ static int dtl1_probe(struct pcmcia_device *link)
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
         link->resource[0]->end = 8;
 
-        link->conf.Attributes = CONF_ENABLE_IRQ;
+        link->config_flags |= CONF_ENABLE_IRQ;
 
         return dtl1_config(link);
 }
@@ -619,7 +618,7 @@ static int dtl1_config(struct pcmcia_device *link)
         if (i != 0)
                 goto failed;
 
-        i = pcmcia_request_configuration(link, &link->conf);
+        i = pcmcia_enable_device(link);
         if (i != 0)
                 goto failed;