Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

[karo-tx-linux.git] / drivers / pcmcia / sa1100_simpad.c

diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index 33a08ae09fdfa7aec75ca698548fe46b8d0903ab..05bd504e6f18a47ff43c24d7bbba27c185ebe822 100644 (file)
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/drivers/pcmcia/sa1100_simpad.c
@@ -28,7 +28,7 @@ static int simpad_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 
        clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
 
-       skt->irq = IRQ_GPIO_CF_IRQ;
+       skt->socket.pci_irq = IRQ_GPIO_CF_IRQ;
 
        return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
 }