Merge branch 'dock' into release

[mv-sheeva.git] / drivers / pcmcia / pxa2xx_palmld.c

diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c
index 5ba9b3664a00abdf8eb5bab95c80cccb12ab2d31..6fb6f7f0672ea7d29f7ce23d709881037ab4250c 100644 (file)
--- a/drivers/pcmcia/pxa2xx_palmld.c
+++ b/drivers/pcmcia/pxa2xx_palmld.c
@@ -45,7 +45,7 @@ static int palmld_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
        if (ret)
                goto err4;
 
-       skt->irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);
+       skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);
        return 0;
 
 err4: