diff options
| author | Russell King - ARM Linux | 2009-03-29 23:45:26 +0200 |
|---|---|---|
| committer | Dominik Brodowski | 2009-11-09 08:30:16 +0100 |
| commit | 66024db57d5b9011e274b314affad68f370c0d6f (patch) | |
| tree | 15094385300234e71fe3c9409860cf0c3535e1ac /drivers/pcmcia/sa1111_generic.c | |
| parent | PCMCIA: ss: allow PCI IRQs > 255 (diff) | |
| download | kernel-qcow2-linux-66024db57d5b9011e274b314affad68f370c0d6f.tar.gz kernel-qcow2-linux-66024db57d5b9011e274b314affad68f370c0d6f.tar.xz kernel-qcow2-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/sa1111_generic.c')
| -rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 219860aba818..deb5036ee5fb 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c @@ -137,10 +137,10 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, return -ENOMEM; s->soc.nr = ops->first + i; - s->soc.irq = s->soc.nr ? IRQ_S1_READY_NINT : IRQ_S0_READY_NINT; s->soc.ops = ops; s->soc.socket.owner = ops->owner; s->soc.socket.dev.parent = &dev->dev; + s->soc.socket.pci_irq = s->soc.nr ? IRQ_S1_READY_NINT : IRQ_S0_READY_NINT; s->dev = dev; ret = add(&s->soc); |