ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq
Eric Miao [Wed, 9 Dec 2009 10:54:05 +0000 (18:54 +0800)]
commit 66024db removes all other references of skt->irq by using
skt->socket.pci_irq, while leaving these two missed. Get them fixed.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

drivers/pcmcia/pxa2xx_palmtc.c
drivers/pcmcia/pxa2xx_stargate2.c

index 3a8993e..459a232 100644 (file)
@@ -67,7 +67,7 @@ static int palmtc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
        if (ret)
                goto err7;
 
-       skt->irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);
+       skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);
        return 0;
 
 err7:
index 490749e..d08802f 100644 (file)
@@ -40,7 +40,7 @@ static struct pcmcia_irqs irqs[] = {
 
 static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-       skt->irq = IRQ_GPIO(SG2_S0_GPIO_READY);
+       skt->socket.pci_irq = IRQ_GPIO(SG2_S0_GPIO_READY);
        return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
 }