diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2009-03-29 23:45:26 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-09 08:30:16 +0100 |
| commit | 66024db57d5b9011e274b314affad68f370c0d6f (patch) | |
| tree | 15094385300234e71fe3c9409860cf0c3535e1ac /drivers/pcmcia/pxa2xx_e740.c | |
| parent | PCMCIA: ss: allow PCI IRQs > 255 (diff) | |
| download | linux-66024db57d5b9011e274b314affad68f370c0d6f.tar.xz linux-66024db57d5b9011e274b314affad68f370c0d6f.zip | |
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_e740.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_e740.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_e740.c b/drivers/pcmcia/pxa2xx_e740.c index d09c0dc4a31a..8bfbd4dca131 100644 --- a/drivers/pcmcia/pxa2xx_e740.c +++ b/drivers/pcmcia/pxa2xx_e740.c @@ -38,7 +38,7 @@ static struct pcmcia_irqs cd_irqs[] = { static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt) { - skt->irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) : + skt->socket.pci_irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) : IRQ_GPIO(GPIO_E740_PCMCIA_RDY1); return soc_pcmcia_request_irqs(skt, &cd_irqs[skt->nr], 1); |