Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[safe/jmp/linux-2.6] / drivers / pcmcia / sa11xx_base.c

diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index ac99872..fa28d89 100644 (file)
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -37,6 +37,7 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
@@ -235,10 +236,10 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
                skt = &sinfo->skt[i];
 
                skt->nr = first + i;
-               skt->irq = NO_IRQ;
                skt->ops = ops;
                skt->socket.owner = ops->owner;
                skt->socket.dev.parent = dev;
+               skt->socket.pci_irq = NO_IRQ;
 
                ret = sa11xx_drv_pcmcia_add_one(skt);
                if (ret)