summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/pxa2xx_palmtx.c
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2009-03-30 01:45:26 +0400
committerDominik Brodowski <linux@dominikbrodowski.net>2009-11-09 10:30:16 +0300
commit66024db57d5b9011e274b314affad68f370c0d6f (patch)
tree15094385300234e71fe3c9409860cf0c3535e1ac /drivers/pcmcia/pxa2xx_palmtx.c
parent1689164a272a962572a1f31af715dfe462cf7910 (diff)
downloadlinux-66024db57d5b9011e274b314affad68f370c0d6f.tar.xz
PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
skt->irq is a mere duplication of pcmcia_socket's pci_irq member. Get rid of it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_palmtx.c')
-rw-r--r--drivers/pcmcia/pxa2xx_palmtx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_palmtx.c b/drivers/pcmcia/pxa2xx_palmtx.c
index e07b5c51ec5b..b07b247a399f 100644
--- a/drivers/pcmcia/pxa2xx_palmtx.c
+++ b/drivers/pcmcia/pxa2xx_palmtx.c
@@ -53,7 +53,7 @@ static int palmtx_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
if (ret)
goto err5;
- skt->irq = gpio_to_irq(GPIO_NR_PALMTX_PCMCIA_READY);
+ skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMTX_PCMCIA_READY);
return 0;
err5: