Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[karo-tx-linux.git] / arch / arm / plat-mxc / Kconfig

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 8b7ab8ce97113fd4e53110a3a34a752c3640ffa9..a5353fc0793f16ab17031464f2d5ac90f283c70e 100644 (file)
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -4,6 +4,12 @@ source "arch/arm/plat-mxc/devices/Kconfig"
 
 menu "Freescale MXC Implementations"
 
+config ARCH_MX50_SUPPORTED
+       bool
+
+config ARCH_MX53_SUPPORTED
+       bool
+
 choice
        prompt "Freescale CPU family:"
        default ARCH_MX3
@@ -28,15 +34,23 @@ config ARCH_MX3
        help
          This enables support for systems based on the Freescale i.MX3 family
 
-config ARCH_MX5
-       bool "MX5-based"
+config ARCH_MX503
+       bool "i.MX50 + i.MX53"
+       select ARCH_MX50_SUPPORTED
+       select ARCH_MX53_SUPPORTED
+       help
+         This enables support for machines using Freescale's i.MX50 and i.MX51
+         processors.
+
+config ARCH_MX51
+       bool "i.MX51"
+       select ARCH_MX51_SUPPORTED
        help
          This enables support for systems based on the Freescale i.MX51 family
 
 endchoice
 
 source "arch/arm/mach-imx/Kconfig"
-source "arch/arm/mach-mx3/Kconfig"
 source "arch/arm/mach-mx5/Kconfig"
 
 endmenu