From: David Cross Date: Fri, 10 Sep 2010 23:51:05 +0000 (-0700) Subject: Staging: west bridge: Kconfig fix X-Git-Tag: v2.6.37-rc1~60^2~3^2~598 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4ecea3c51b42419d6cd314b3d36c6ceaa9c204e9;p=karo-tx-linux.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/westbridge/Kconfig b/drivers/staging/westbridge/Kconfig index 57468125b391..2b1c2ae557b6 100644 --- 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"