PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

[people/ms/linux.git] / drivers / pcmcia / sa1100_assabet.c

diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c
index ac8aa09ba0da56b33f12e3a9ba0168ef73e54779..fd013a1ef47abcdd5746f4fa7f9885670fc2a9cd 100644 (file)
--- a/drivers/pcmcia/sa1100_assabet.c
+++ b/drivers/pcmcia/sa1100_assabet.c
@@ -27,7 +27,7 @@ static struct pcmcia_irqs irqs[] = {
 
 static int assabet_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-       skt->irq = ASSABET_IRQ_GPIO_CF_IRQ;
+       skt->socket.pci_irq = ASSABET_IRQ_GPIO_CF_IRQ;
 
        return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
 }