PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

[pandora-kernel.git] / drivers / pcmcia / pxa2xx_base.c

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 7f61b62..84dde77 100644 (file)
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -287,10 +287,10 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)
                skt = &sinfo->skt[i];
 
                skt->nr = ops->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 = pxa2xx_drv_pcmcia_add_one(skt);
                if (ret)