aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pxa2xx_base.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-19 09:07:31 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-26 14:57:17 -0500
commite0d21178ceb06f5bfa81a5697f68384f74af054a (patch)
tree3ff7a16187d91c0e703f14ab9ea9d336719549d9 /drivers/pcmcia/pxa2xx_base.c
parentdcd6c92267155e70a94b3927bce681ce74b80d1f (diff)
PCMCIA: soc_common: move common initialization into soc_common
Move common socket initialization into soc_common.c. Acked-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_base.c')
-rw-r--r--drivers/pcmcia/pxa2xx_base.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index a87e2728b2c3..18474f046e7b 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -318,10 +318,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
318 318
319 skt->nr = ops->first + i; 319 skt->nr = ops->first + i;
320 skt->clk = clk; 320 skt->clk = clk;
321 skt->ops = ops; 321 soc_pcmcia_init_one(skt, ops, &dev->dev);
322 skt->socket.owner = ops->owner;
323 skt->socket.dev.parent = &dev->dev;
324 skt->socket.pci_irq = NO_IRQ;
325 322
326 ret = pxa2xx_drv_pcmcia_add_one(skt); 323 ret = pxa2xx_drv_pcmcia_add_one(skt);
327 if (ret) 324 if (ret)