From 7b0c336306e1956edb4519d7387f6882421943d2 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 6 Dec 2009 16:58:50 +0000
Subject: [PATCH] --- yaml --- r: 172662 b: refs/heads/master c:
 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/pcmcia/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0f0aab24239e..675b249c60d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba71e17269633ea36e776d744d5cc0fcb5a41f93
+refs/heads/master: 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4
diff --git a/trunk/drivers/pcmcia/Kconfig b/trunk/drivers/pcmcia/Kconfig
index f3ccbccf5f21..cd5082d3ca19 100644
--- a/trunk/drivers/pcmcia/Kconfig
+++ b/trunk/drivers/pcmcia/Kconfig
@@ -179,7 +179,7 @@ config PCMCIA_BCM63XX
 	depends on BCM63XX && PCMCIA
 
 config PCMCIA_SOC_COMMON
-	bool
+	tristate
 
 config PCMCIA_SA1100
 	tristate "SA1100 support"