From 5810775b47e2152e98623aa270fec771576eb88b Mon Sep 17 00:00:00 2001
From: Pavel Machek <pma@sysgo.com>
Date: Fri, 4 Feb 2011 09:03:43 +0100
Subject: [PATCH] --- yaml --- r: 233557 b: refs/heads/master c:
 5b703683b6cc3cb97bbe6b1b14898b273eb59279 h: refs/heads/master i:   233555:
 c726c1a227a37a901f4d00558f87788febf60702 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/pcmcia/pxa2xx_base.c    | 2 +-
 trunk/drivers/pcmcia/pxa2xx_base.h    | 1 +
 trunk/drivers/pcmcia/pxa2xx_lubbock.c | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0c1f71fc5b2c..0bd6f6a6c0f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5bb2923cfa0a29c5854f9618703ff60849b949e
+refs/heads/master: 5b703683b6cc3cb97bbe6b1b14898b273eb59279
diff --git a/trunk/drivers/pcmcia/pxa2xx_base.c b/trunk/drivers/pcmcia/pxa2xx_base.c
index 3755e7c8c715..2c540542b5af 100644
--- a/trunk/drivers/pcmcia/pxa2xx_base.c
+++ b/trunk/drivers/pcmcia/pxa2xx_base.c
@@ -215,7 +215,7 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
 }
 #endif
 
-static void pxa2xx_configure_sockets(struct device *dev)
+void pxa2xx_configure_sockets(struct device *dev)
 {
 	struct pcmcia_low_level *ops = dev->platform_data;
 	/*
diff --git a/trunk/drivers/pcmcia/pxa2xx_base.h b/trunk/drivers/pcmcia/pxa2xx_base.h
index bb62ea87b8f9..b609b45469ed 100644
--- a/trunk/drivers/pcmcia/pxa2xx_base.h
+++ b/trunk/drivers/pcmcia/pxa2xx_base.h
@@ -1,3 +1,4 @@
 int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt);
 void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops);
+void pxa2xx_configure_sockets(struct device *dev);
 
diff --git a/trunk/drivers/pcmcia/pxa2xx_lubbock.c b/trunk/drivers/pcmcia/pxa2xx_lubbock.c
index b9f8c8fb42bd..25afe637c657 100644
--- a/trunk/drivers/pcmcia/pxa2xx_lubbock.c
+++ b/trunk/drivers/pcmcia/pxa2xx_lubbock.c
@@ -226,6 +226,7 @@ int pcmcia_lubbock_init(struct sa1111_dev *sadev)
 		lubbock_set_misc_wr((1 << 15) | (1 << 14), 0);
 
 		pxa2xx_drv_pcmcia_ops(&lubbock_pcmcia_ops);
+		pxa2xx_configure_sockets(&sadev->dev);
 		ret = sa1111_pcmcia_add(sadev, &lubbock_pcmcia_ops,
 				pxa2xx_drv_pcmcia_add_one);
 	}