summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/sa1100_shannon.c
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2009-03-29 22:45:26 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2009-11-09 08:30:16 +0100
commit66024db57d5b9011e274b314affad68f370c0d6f (patch)
tree15094385300234e71fe3c9409860cf0c3535e1ac /drivers/pcmcia/sa1100_shannon.c
parent1689164a272a962572a1f31af715dfe462cf7910 (diff)
downloadop-kernel-dev-66024db57d5b9011e274b314affad68f370c0d6f.zip
op-kernel-dev-66024db57d5b9011e274b314affad68f370c0d6f.tar.gz
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/sa1100_shannon.c')
-rw-r--r--drivers/pcmcia/sa1100_shannon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c
index 46d8c19..c4d5186 100644
--- a/drivers/pcmcia/sa1100_shannon.c
+++ b/drivers/pcmcia/sa1100_shannon.c
@@ -28,7 +28,7 @@ static int shannon_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
GAFR &= ~(SHANNON_GPIO_EJECT_0 | SHANNON_GPIO_EJECT_1 |
SHANNON_GPIO_RDY_0 | SHANNON_GPIO_RDY_1);
- skt->irq = skt->nr ? SHANNON_IRQ_GPIO_RDY_1 : SHANNON_IRQ_GPIO_RDY_0;
+ skt->socket.pci_irq = skt->nr ? SHANNON_IRQ_GPIO_RDY_1 : SHANNON_IRQ_GPIO_RDY_0;
return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
}
OpenPOWER on IntegriCloud