Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...

[~andy/linux] / arch / arm / mach-spear6xx / Kconfig

diff --git a/arch/arm/mach-spear6xx/Kconfig b/arch/arm/mach-spear6xx/Kconfig
index fbe298bd1d927ee31453817598f351b2629ca666..339f397dea705bb6cdded179c3f1bcc5db67e7ef 100644 (file)
--- a/arch/arm/mach-spear6xx/Kconfig
+++ b/arch/arm/mach-spear6xx/Kconfig
@@ -2,21 +2,9 @@
 # SPEAr6XX Machine configuration file
 #
 
-if ARCH_SPEAR6XX
-
-menu "SPEAr6xx Implementations"
-config BOARD_SPEAR600_DT
-       bool "SPEAr600 generic board configured via device-tree"
-       select MACH_SPEAR600
+config MACH_SPEAR600
+       def_bool y
+       depends on ARCH_SPEAR6XX
        select USE_OF
        help
          Supports ST SPEAr600 boards configured via the device-tree
-
-endmenu
-
-config MACH_SPEAR600
-       bool "SPEAr600"
-       help
-         Supports ST SPEAr600 Machine
-
-endif #ARCH_SPEAR6XX