git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
[pandora-kernel.git]
/
drivers
/
pcmcia
/
pxa2xx_viper.c
diff --git
a/drivers/pcmcia/pxa2xx_viper.c
b/drivers/pcmcia/pxa2xx_viper.c
index
1787136
..
27be2e1
100644
(file)
--- a/
drivers/pcmcia/pxa2xx_viper.c
+++ b/
drivers/pcmcia/pxa2xx_viper.c
@@
-40,7
+40,7
@@
static int viper_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
{
unsigned long flags;
- skt->irq = gpio_to_irq(VIPER_CF_RDY_GPIO);
+ skt->
socket.pci_
irq = gpio_to_irq(VIPER_CF_RDY_GPIO);
if (gpio_request(VIPER_CF_CD_GPIO, "CF detect"))
goto err_request_cd;