Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[mv-sheeva.git] / drivers / staging / wlags49_h2 / wl_cs.c

diff --git a/drivers/staging/wlags49_h2/wl_cs.c b/drivers/staging/wlags49_h2/wl_cs.c
index 464b0673da42ce4c7743459cdbc1a88d0909c71d..19c335458653fc1a293c2533017a5d426cdf4805 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@ -83,7 +83,6 @@
 #include <linux/if_arp.h>
 #include <linux/ioport.h>
 
-#include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
@@ -146,9 +145,8 @@ static int wl_adapter_attach(struct pcmcia_device *link)
                return -ENOMEM;
        }
 
-       link->io.NumPorts1      = HCF_NUM_IO_PORTS;
-       link->io.Attributes1    = IO_DATA_PATH_WIDTH_16;
-       link->io.IOAddrLines    = 6;
+       link->resource[0]->end  = HCF_NUM_IO_PORTS;
+       link->resource[0]->flags= IO_DATA_PATH_WIDTH_16;
        link->conf.Attributes   = CONF_ENABLE_IRQ;
        link->conf.IntType      = INT_MEMORY_AND_IO;
        link->conf.ConfigIndex  = 5;
@@ -305,8 +303,9 @@ void wl_adapter_insert(struct pcmcia_device *link)
 
        /* Do we need to allocate an interrupt? */
        link->conf.Attributes |= CONF_ENABLE_IRQ;
+       link->io_lines = 6;
 
-       ret = pcmcia_request_io(link, &link->io);
+       ret = pcmcia_request_io(link);
        if (ret != 0)
                goto failed;
 
@@ -319,7 +318,7 @@ void wl_adapter_insert(struct pcmcia_device *link)
                goto failed;
 
        dev->irq        = link->irq;
-       dev->base_addr  = link->io.BasePort1;
+       dev->base_addr  = link->resource[0]->start;
 
        SET_NETDEV_DEV(dev, &link->dev);
        if (register_netdev(dev) != 0) {