---

yaml --- r: 176009 b: refs/heads/master c: 0029397 h: refs/heads/master i: 176007: 7c5ca3c v: v3
git-mirror · Dec 13, 2009 · 10a1b72 · 10a1b72
1 parent 4a403ec
commit 10a1b72
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0d26c33b63c7ec10c3fdf9c7ce0aa035f0b3200
+refs/heads/master: 002939729c7c8f6448e89e9e86c8c5bf6f0c77d3
diff --git a/trunk/drivers/pcmcia/pxa2xx_palmtc.c b/trunk/drivers/pcmcia/pxa2xx_palmtc.c
@@ -67,7 +67,7 @@ static int palmtc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 	if (ret)
 		goto err7;
 
-	skt->irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);
+	skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);
 	return 0;
 
 err7:

diff --git a/trunk/drivers/pcmcia/pxa2xx_stargate2.c b/trunk/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)
 {
-	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));
 }