diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2009-12-09 18:54:05 +0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 16:33:13 +0000 |
| commit | 002939729c7c8f6448e89e9e86c8c5bf6f0c77d3 (patch) | |
| tree | 66a5c7b64da1d4f3b66728accb9e95983df6722b /drivers/pcmcia | |
| parent | d0d26c33b63c7ec10c3fdf9c7ce0aa035f0b3200 (diff) | |
| download | op-kernel-dev-002939729c7c8f6448e89e9e86c8c5bf6f0c77d3.zip op-kernel-dev-002939729c7c8f6448e89e9e86c8c5bf6f0c77d3.tar.gz | |
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>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_palmtc.c | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/pxa2xx_stargate2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/pxa2xx_palmtc.c b/drivers/pcmcia/pxa2xx_palmtc.c index 3a8993e..459a232 100644 --- 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 490749e..d08802f 100644 --- 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)); } |
