diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 14:04:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 14:04:06 +1100 |
| commit | 7c84dd7f30074fffb78a158c5bcf143b9fc4e099 (patch) | |
| tree | d393c5404896761d3971399c47ec2053980f6e39 /drivers/pcmcia/pxa2xx_trizeps4.c | |
| parent | 01342ac6d4e45c674b7ea7d5fea67778869a2817 (diff) | |
| parent | b285fab4185a9b3db953726f0dd9d343a6e389db (diff) | |
Merge remote branch 'pcmcia/master'
Conflicts:
drivers/mtd/maps/pcmciamtd.c
drivers/net/wireless/ray_cs.c
drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/pcmcia/pxa2xx_trizeps4.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_trizeps4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c index e0e5cb339b4a..b7e596620db1 100644 --- a/drivers/pcmcia/pxa2xx_trizeps4.c +++ b/drivers/pcmcia/pxa2xx_trizeps4.c @@ -53,7 +53,7 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt) gpio_free(GPIO_PRDY); return -EINVAL; } - skt->irq = IRQ_GPIO(GPIO_PRDY); + skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY); break; #ifndef CONFIG_MACH_TRIZEPS_CONXS @@ -63,7 +63,7 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt) break; } /* release the reset of this card */ - pr_debug("%s: sock %d irq %d\n", __func__, skt->nr, skt->irq); + pr_debug("%s: sock %d irq %d\n", __func__, skt->nr, skt->socket.pci_irq); /* supplementory irqs for the socket */ for (i = 0; i < ARRAY_SIZE(irqs); i++) { |