diff options
Diffstat (limited to 'drivers/pcmcia/pxa2xx_trizeps4.c')
-rw-r--r-- | drivers/pcmcia/pxa2xx_trizeps4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c index 57ddb969d888..7c33f898135a 100644 --- a/drivers/pcmcia/pxa2xx_trizeps4.c +++ b/drivers/pcmcia/pxa2xx_trizeps4.c | |||
@@ -30,7 +30,7 @@ | |||
30 | extern void board_pcmcia_power(int power); | 30 | extern void board_pcmcia_power(int power); |
31 | 31 | ||
32 | static struct pcmcia_irqs irqs[] = { | 32 | static struct pcmcia_irqs irqs[] = { |
33 | { 0, IRQ_GPIO(GPIO_PCD), "cs0_cd" } | 33 | { .sock = 0, .str = "cs0_cd" } |
34 | /* on other baseboards we can have more inputs */ | 34 | /* on other baseboards we can have more inputs */ |
35 | }; | 35 | }; |
36 | 36 | ||
@@ -53,7 +53,8 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
53 | gpio_free(GPIO_PRDY); | 53 | gpio_free(GPIO_PRDY); |
54 | return -EINVAL; | 54 | return -EINVAL; |
55 | } | 55 | } |
56 | skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY); | 56 | skt->socket.pci_irq = gpio_to_irq(GPIO_PRDY); |
57 | irqs[0].irq = gpio_to_irq(GPIO_PCD); | ||
57 | break; | 58 | break; |
58 | default: | 59 | default: |
59 | break; | 60 | break; |