Merge branch 'linus' into core/softlockup

[mirror_ubuntu-hirsute-kernel.git] / arch / arm / plat-mxc / Kconfig

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 03a65c0dfb6087de55a7b0627351d8406f38b278..e14eaad11dd5aec3c330a0ac43d1e9d24b91bb41 100644 (file)
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -3,8 +3,13 @@ if ARCH_MXC
 menu "Freescale MXC Implementations"
 
 choice
-       prompt "MXC/iMX System Type"
-       default 0
+       prompt "MXC/iMX Base Type"
+       default ARCH_MX3
+
+config ARCH_MX2
+       bool "MX2-based"
+       help
+         This enables support for systems based on the Freescale i.MX2 family
 
 config ARCH_MX3
        bool "MX3-based"
@@ -13,6 +18,7 @@ config ARCH_MX3
 
 endchoice
 
+source "arch/arm/mach-mx2/Kconfig"
 source "arch/arm/mach-mx3/Kconfig"
 
 endmenu