[PATCH] pcmcia: Fix additional platforms after removal of skt->irq in 66024db57d5b9011e274b314affad68f370c0d6f

Jonathan Cameron jic23 at cam.ac.uk
Fri Dec 4 11:31:24 EST 2009


Actually, sorry for the noise. Please hold off on this one, there are more
problems due to the same patch set. Should have waited for the compile to finish!

Jonathan
> Signed-off-by: Jonathan Cameron <jic23 at cam.ac.uk>
> ---
> 
> Russell's original patch is currently in linux-next (and hence I'm
> guessing heading for the merge window?).  In the intervening time,
> 2 platforms have been added using the now nonexistent skt-irq.
> This patch fixes them as per the other platforms.
> 
>  drivers/pcmcia/pxa2xx_palmtc.c    |    2 +-
>  drivers/pcmcia/pxa2xx_stargate2.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pcmcia/pxa2xx_palmtc.c b/drivers/pcmcia/pxa2xx_palmtc.c
> index 3a8993e..459a232 100644
> --- a/drivers/pcmcia/pxa2xx_palmtc.c
> +++ b/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/drivers/pcmcia/pxa2xx_stargate2.c b/drivers/pcmcia/pxa2xx_stargate2.c
> index 490749e..d08802f 100644
> --- 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)
>  {
> -	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));
>  }
>  




More information about the linux-arm-kernel mailing list