Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[sfrench/cifs-2.6.git] / arch / arm / mach-mxs / Kconfig

diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 07d5383d68ee69f7e5f9bdd652f339d2f9f8f130..91cf0625819c2f62639cff7216e6563b9813e585 100644 (file)
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -7,18 +7,28 @@ config MXS_OCOTP
 
 config SOC_IMX23
        bool
+       select ARM_AMBA
        select CPU_ARM926T
        select HAVE_PWM
        select PINCTRL_IMX23
 
 config SOC_IMX28
        bool
+       select ARM_AMBA
        select CPU_ARM926T
        select HAVE_PWM
        select PINCTRL_IMX28
 
 comment "MXS platforms:"
 
+config MACH_MXS_DT
+       bool "Support MXS platforms from device tree"
+       select SOC_IMX23
+       select SOC_IMX28
+       help
+         Include support for Freescale MXS platforms(i.MX23 and i.MX28)
+         using the device tree for discovery
+
 config MACH_STMP378X_DEVB
        bool "Support STMP378x_devb Platform"
        select SOC_IMX23