From 10a1b723659c20f5c311909711592d2c938d03be Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Wed, 9 Dec 2009 18:54:05 +0800 Subject: [PATCH] --- yaml --- r: 176009 b: refs/heads/master c: 002939729c7c8f6448e89e9e86c8c5bf6f0c77d3 h: refs/heads/master i: 176007: 7c5ca3c550760b89ad3bb75f5c8c6d705811ba35 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/pxa2xx_palmtc.c | 2 +- trunk/drivers/pcmcia/pxa2xx_stargate2.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7a8400ede29b..e7edb8fde7a6 100644 --- 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 index 3a8993ed5621..459a232d66be 100644 --- 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 index 490749ea677f..d08802fe35f9 100644 --- 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)); }