Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[pandora-kernel.git] / arch / arm / mach-spear3xx / Kconfig

diff --git a/arch/arm/mach-spear3xx/Kconfig b/arch/arm/mach-spear3xx/Kconfig
index 20d1317..2cee6b0 100644 (file)
--- a/arch/arm/mach-spear3xx/Kconfig
+++ b/arch/arm/mach-spear3xx/Kconfig
@@ -4,9 +4,26 @@
 
 if ARCH_SPEAR3XX
 
-choice
-       prompt "SPEAr3XX Family"
-       default MACH_SPEAR300
+menu "SPEAr3xx Implementations"
+config BOARD_SPEAR300_EVB
+       bool "SPEAr300 Evaluation Board"
+       select MACH_SPEAR300
+       help
+         Supports ST SPEAr300 Evaluation Board
+
+config BOARD_SPEAR310_EVB
+       bool "SPEAr310 Evaluation Board"
+       select MACH_SPEAR310
+       help
+         Supports ST SPEAr310 Evaluation Board
+
+config BOARD_SPEAR320_EVB
+       bool "SPEAr320 Evaluation Board"
+       select MACH_SPEAR320
+       help
+         Supports ST SPEAr320 Evaluation Board
+
+endmenu
 
 config MACH_SPEAR300
        bool "SPEAr300"
@@ -23,11 +40,4 @@ config MACH_SPEAR320
        help
          Supports ST SPEAr320 Machine
 
-endchoice
-
-# Adding SPEAr3XX machine specific configuration files
-source "arch/arm/mach-spear3xx/Kconfig300"
-source "arch/arm/mach-spear3xx/Kconfig310"
-source "arch/arm/mach-spear3xx/Kconfig320"
-
 endif #ARCH_SPEAR3XX