Staging: west bridge: Kconfig fix

This patch fixes the currently broken Kconfig for west bridge by
introducing a dependency on a valid HAL Layer for the driver build.

Signed-off-by: David Cross <david.cross@cypress.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/westbridge/Kconfig b/drivers/staging/westbridge/Kconfig
index 57468125b391fe554a2758a5471797a136131f0e..2b1c2ae557b6ceed3ac67d879277daf8cd3aecae 100644 (file)
--- a/drivers/staging/westbridge/Kconfig
+++ b/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"