From 86b40776a5e855a0a0d35c667c7bd55ca5ea4fea Mon Sep 17 00:00:00 2001
From: David Cross <david.cross@cypress.com>
Date: Fri, 10 Sep 2010 16:51:05 -0700
Subject: [PATCH] --- yaml --- r: 219849 b: refs/heads/master c:
 4ecea3c51b42419d6cd314b3d36c6ceaa9c204e9 h: refs/heads/master i:   219847:
 49aa222e078a5d3e0d6f1edeb799434b738f629e v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/westbridge/Kconfig | 29 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0290ffc452ae..6770450573eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8be11ffcf59e9bcb5f0a2a2b2e7b43d56c797b98
+refs/heads/master: 4ecea3c51b42419d6cd314b3d36c6ceaa9c204e9
diff --git a/trunk/drivers/staging/westbridge/Kconfig b/trunk/drivers/staging/westbridge/Kconfig
index 57468125b391..2b1c2ae557b6 100644
--- a/trunk/drivers/staging/westbridge/Kconfig
+++ b/trunk/drivers/staging/westbridge/Kconfig
@@ -4,7 +4,7 @@
 
 menuconfig WESTBRIDGE
 	tristate "West Bridge support"
-	depends on HAS_IOMEM && BROKEN
+	depends on WESTBRIDGE_HAL_SELECTED
 	help
 	  This selects West Bridge Peripheral controller support.
 
@@ -12,7 +12,7 @@ menuconfig WESTBRIDGE
 
 menuconfig WESTBRIDGE_ASTORIA
 	bool "West Bridge Astoria support"
-	depends on WESTBRIDGE != n
+	depends on WESTBRIDGE != n && WESTBRIDGE_HAL_SELECTED
 	help
 		This option enables support for West Bridge Astoria
 
@@ -20,11 +20,30 @@ if WESTBRIDGE_ASTORIA
 source "drivers/staging/westbridge/astoria/Kconfig"
 endif #WESTBRIDGE_ASTORIA
 
-menuconfig MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL
+config	WESTBRIDGE_HAL_SELECTED
+	boolean
+
+choice
+	prompt "West Bridge HAL"
+	help
+	   West Bridge HAL/processor interface to be used
+
+#
+# HAL Layers
+#
+
+config MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL
 	bool "WESTBRIDGE OMAP3430 Astoria PNAND HAL"
-	depends on ARCH_OMAP3 && WESTBRIDGE_ASTORIA
+	depends on ARCH_OMAP3
+	select WESTBRIDGE_HAL_SELECTED
+	help
+	   Include the OMAP3430 HAL for PNAND interface
+
+config MACH_NO_WESTBRIDGE
+	bool "no West Bridge HAL selected"
 	help
-		Include the OMAP3430 Linux Based HAL
+	   Do not include any HAL layer(de-activates West Bridge option)
+endchoice
 
 config WESTBRIDGE_DEBUG
 	bool "West Bridge debugging"