diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:55:17 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:55:17 +0100 |
| commit | b675b3667f6729dcd1036a2a129b35445947f905 (patch) | |
| tree | 0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /drivers/pcmcia/pxa2xx_palmld.c | |
| parent | Input: max8925_onkey - avoid accessing input device too early (diff) | |
| parent | Linux 3.3-rc6 (diff) | |
| download | linux-b675b3667f6729dcd1036a2a129b35445947f905.tar.xz linux-b675b3667f6729dcd1036a2a129b35445947f905.zip | |
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'drivers/pcmcia/pxa2xx_palmld.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_palmld.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c index d589ad1dcd4c..6a8e011a8c13 100644 --- a/drivers/pcmcia/pxa2xx_palmld.c +++ b/drivers/pcmcia/pxa2xx_palmld.c @@ -33,7 +33,7 @@ static int palmld_pcmcia_hw_init(struct soc_pcmcia_socket *skt) ret = gpio_request_array(palmld_pcmcia_gpios, ARRAY_SIZE(palmld_pcmcia_gpios)); - skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY); + skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMLD_PCMCIA_READY); return ret; } |