projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pcmcia
/
pxa2xx_mainstone.c
diff --git
a/drivers/pcmcia/pxa2xx_mainstone.c
b/drivers/pcmcia/pxa2xx_mainstone.c
index 1138551ba8f61fb8f77669b9c2fcb0dea0cf5645..92016fe932b46bfd720b6ecfc56fca26a6add563 100644
(file)
--- a/
drivers/pcmcia/pxa2xx_mainstone.c
+++ b/
drivers/pcmcia/pxa2xx_mainstone.c
@@
-44,7
+44,7
@@
static int mst_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
* before we enable them as outputs.
*/
- skt->irq = (skt->nr == 0) ? MAINSTONE_S0_IRQ : MAINSTONE_S1_IRQ;
+ skt->
socket.pci_
irq = (skt->nr == 0) ? MAINSTONE_S0_IRQ : MAINSTONE_S1_IRQ;
return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
}