diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 19:39:35 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 19:39:35 +0000 |
| commit | fc7736688b046f91170591625b38f12a839ba994 (patch) | |
| tree | e7198a9fabfcea785cbb16375455dbdb6aa9871b /drivers/pcmcia/pxa2xx_stargate2.c | |
| parent | bc7ecbcbc2c0ff235382077b55de7896775afc16 (diff) | |
| parent | 9074e144c10cba5d6bb6b326a8be5347d38e4473 (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'drivers/pcmcia/pxa2xx_stargate2.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_stargate2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_stargate2.c b/drivers/pcmcia/pxa2xx_stargate2.c index 490749ea677f..d08802fe35f9 100644 --- a/drivers/pcmcia/pxa2xx_stargate2.c +++ b/drivers/pcmcia/pxa2xx_stargate2.c @@ -40,7 +40,7 @@ static struct pcmcia_irqs irqs[] = { static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt) { - skt->irq = IRQ_GPIO(SG2_S0_GPIO_READY); + skt->socket.pci_irq = IRQ_GPIO(SG2_S0_GPIO_READY); return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs)); } |