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_base.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_base.c')
-rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 7f61b62a1de0..84dde7768ad5 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
@@ -287,10 +287,10 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev) | |||
287 | skt = &sinfo->skt[i]; | 287 | skt = &sinfo->skt[i]; |
288 | 288 | ||
289 | skt->nr = ops->first + i; | 289 | skt->nr = ops->first + i; |
290 | skt->irq = NO_IRQ; | ||
291 | skt->ops = ops; | 290 | skt->ops = ops; |
292 | skt->socket.owner = ops->owner; | 291 | skt->socket.owner = ops->owner; |
293 | skt->socket.dev.parent = dev; | 292 | skt->socket.dev.parent = dev; |
293 | skt->socket.pci_irq = NO_IRQ; | ||
294 | 294 | ||
295 | ret = pxa2xx_drv_pcmcia_add_one(skt); | 295 | ret = pxa2xx_drv_pcmcia_add_one(skt); |
296 | if (ret) | 296 | if (ret) |