ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq

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>

diff --git a/drivers/pcmcia/pxa2xx_palmtc.c b/drivers/pcmcia/pxa2xx_palmtc.c
index 3a8993ed562120f7da811620c770d98f23430831..459a232d66be2caad82155d712cb97c62a7b01a6 100644 (file)
--- a/drivers/pcmcia/pxa2xx_palmtc.c
+++ b/drivers/pcmcia/pxa2xx_palmtc.c
@@ -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:

diff --git a/drivers/pcmcia/pxa2xx_stargate2.c b/drivers/pcmcia/pxa2xx_stargate2.c
index 490749ea677faed056b3db7e8fc2115c8967bba4..d08802fe35f9a993cdd50cec2410543d83aa29ad 100644 (file)
--- a/drivers/pcmcia/pxa2xx_stargate2.c
+++ b/drivers/pcmcia/pxa2xx_stargate2.c
@@ -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));
 }