Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...

[linux-flexiantxendom0-3.2.10.git] / drivers / pcmcia / sa11xx_base.c

diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index 79ecc23..6eecd7c 100644 (file)
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -235,10 +235,7 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
                skt = &sinfo->skt[i];
 
                skt->nr = first + i;
-               skt->ops = ops;
-               skt->socket.owner = ops->owner;
-               skt->socket.dev.parent = dev;
-               skt->socket.pci_irq = NO_IRQ;
+               soc_pcmcia_init_one(skt, ops, dev);
 
                ret = sa11xx_drv_pcmcia_add_one(skt);
                if (ret)