diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2009-03-29 22:45:26 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-09 08:30:16 +0100 |
| commit | 66024db57d5b9011e274b314affad68f370c0d6f (patch) | |
| tree | 15094385300234e71fe3c9409860cf0c3535e1ac /drivers/pcmcia/pxa2xx_base.c | |
| parent | 1689164a272a962572a1f31af715dfe462cf7910 (diff) | |
| download | blackbird-op-linux-66024db57d5b9011e274b314affad68f370c0d6f.tar.gz blackbird-op-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_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) skt = &sinfo->skt[i]; skt->nr = ops->first + i; - skt->irq = NO_IRQ; skt->ops = ops; skt->socket.owner = ops->owner; skt->socket.dev.parent = dev; + skt->socket.pci_irq = NO_IRQ; ret = pxa2xx_drv_pcmcia_add_one(skt); if (ret) |
