diff options
author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2009-03-29 17:45:26 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-09 02:30:16 -0500 |
commit | 66024db57d5b9011e274b314affad68f370c0d6f (patch) | |
tree | 15094385300234e71fe3c9409860cf0c3535e1ac /drivers/pcmcia/pxa2xx_sharpsl.c | |
parent | 1689164a272a962572a1f31af715dfe462cf7910 (diff) |
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_sharpsl.c')
-rw-r--r-- | drivers/pcmcia/pxa2xx_sharpsl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index bc43f78f6f0b..0ea3b29440e6 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c | |||
@@ -66,7 +66,7 @@ static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | skt->irq = SCOOP_DEV[skt->nr].irq; | 69 | skt->socket.pci_irq = SCOOP_DEV[skt->nr].irq; |
70 | 70 | ||
71 | return 0; | 71 | return 0; |
72 | } | 72 | } |