projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/gregkh/linux/git/torvalds-2.6
[cascardo/linux.git]
/
drivers
/
pcmcia
/
pxa2xx_stargate2.c
diff --git
a/drivers/pcmcia/pxa2xx_stargate2.c
b/drivers/pcmcia/pxa2xx_stargate2.c
index
490749e
..
d08802f
100644
(file)
--- a/
drivers/pcmcia/pxa2xx_stargate2.c
+++ b/
drivers/pcmcia/pxa2xx_stargate2.c
@@
-40,7
+40,7
@@
static struct pcmcia_irqs irqs[] = {
static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
{
static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
{
- skt->irq = IRQ_GPIO(SG2_S0_GPIO_READY);
+ skt->
socket.pci_
irq = IRQ_GPIO(SG2_S0_GPIO_READY);
return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
}
return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
}