Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-mx2 / Kconfig

diff --git a/arch/arm/mach-mx2/Kconfig b/arch/arm/mach-mx2/Kconfig
index 1eaa97cb716d052b26dc36224a48f685d7c07879..42a788842f496e2d284fb6fad7adc2045f703826 100644 (file)
--- a/arch/arm/mach-mx2/Kconfig
+++ b/arch/arm/mach-mx2/Kconfig
@@ -1,14 +1,22 @@
-comment "MX2 family CPU support"
-       depends on ARCH_MX2
+if ARCH_MX2
+
+choice
+       prompt "CPUs:"
+       default MACH_MX21
+
+config MACH_MX21
+       bool "i.MX21 support"
+       help
+         This enables support for Freescale's MX2 based i.MX21 processor.
 
 config MACH_MX27
        bool "i.MX27 support"
-       depends on ARCH_MX2
        help
          This enables support for Freescale's MX2 based i.MX27 processor.
 
-comment "MX2 Platforms"
-       depends on ARCH_MX2
+endchoice
+
+comment "MX2 platforms:"
 
 config MACH_MX27ADS
        bool "MX27ADS platform"
@@ -37,3 +45,5 @@ config MACH_PCM970_BASEBOARD
          PCM970 evaluation board.
 
 endchoice
+
+endif