Merge branch 'fix/asoc' into for-linus

[mv-sheeva.git] / drivers / pcmcia / pxa2xx_viper.c

diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c
index 17871360fe99efd1247365b51d345510a82858f3..27be2e154df2a92782dbfafa48598c00dc3cd72f 100644 (file)
--- a/drivers/pcmcia/pxa2xx_viper.c
+++ b/drivers/pcmcia/pxa2xx_viper.c
@@ -40,7 +40,7 @@ static int viper_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
        unsigned long flags;
 
-       skt->irq = gpio_to_irq(VIPER_CF_RDY_GPIO);
+       skt->socket.pci_irq = gpio_to_irq(VIPER_CF_RDY_GPIO);
 
        if (gpio_request(VIPER_CF_CD_GPIO, "CF detect"))
                goto err_request_cd;