pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

[linux-2.6-block.git] / drivers / telephony / ixj_pcmcia.c

diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index a1900e5025184521e0fe1c6f0c39b233e43026fe..e23270d1b4d15ec591e4e4c6e0bf763022ebb486 100644 (file)
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -8,7 +8,6 @@
 #include <linux/errno.h>       /* error codes */
 #include <linux/slab.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 
@@ -34,7 +33,6 @@ static int ixj_probe(struct pcmcia_device *p_dev)
        /* Create new ixj device */
        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
        p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
-       p_dev->conf.IntType = INT_MEMORY_AND_IO;
        p_dev->priv = kzalloc(sizeof(struct ixj_info_t), GFP_KERNEL);
        if (!p_dev->priv) {
                return -ENOMEM;
@@ -144,7 +142,7 @@ static int ixj_config(struct pcmcia_device * link)
        if (pcmcia_loop_config(link, ixj_config_check, &dflt))
                goto failed;
 
-       if (pcmcia_request_configuration(link, &link->conf))
+       if (pcmcia_enable_device(link))
                goto failed;
 
        /*