diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 17:00:33 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 17:00:33 +0000 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /drivers/pcmcia/sa1100_cerf.c | |
| parent | Merge branch 'devel-stable' into devel (diff) | |
| parent | Fix soc_common PCMCIA configuration (diff) | |
| download | linux-dev-3d14b5beba35250c548d3851a2b84fce742d8311.tar.xz linux-dev-3d14b5beba35250c548d3851a2b84fce742d8311.zip | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'drivers/pcmcia/sa1100_cerf.c')
| -rw-r--r-- | drivers/pcmcia/sa1100_cerf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c index 63e6bc431a0d..9bf088b17275 100644 --- a/drivers/pcmcia/sa1100_cerf.c +++ b/drivers/pcmcia/sa1100_cerf.c @@ -27,7 +27,7 @@ static struct pcmcia_irqs irqs[] = { static int cerf_pcmcia_hw_init(struct soc_pcmcia_socket *skt) { - skt->irq = CERF_IRQ_GPIO_CF_IRQ; + skt->socket.pci_irq = CERF_IRQ_GPIO_CF_IRQ; return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); } |