Merge branch 'imx' into devel

Conflicts:

	arch/arm/mm/Kconfig

1 files changed, 15 insertions, 2 deletions

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index a2c8b006d710..3a6c8ec34cd9 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -180,8 +180,21 @@ config CPU_ARM925T
 # ARM926T
 config CPU_ARM926T
         bool "Support ARM926T processor"
-        depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI
-        default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI
+        depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || \
+                MACH_VERSATILE_AB || ARCH_OMAP730 || \
+                ARCH_OMAP16XX || MACH_REALVIEW_EB || \
+                ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
+                ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
+                ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
+                ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
+                ARCH_NS9XXX || ARCH_DAVINCI
+        default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \
+                ARCH_OMAP730 || ARCH_OMAP16XX || \
+                ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
+                ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
+                ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
+                ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
+                ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2
         select CPU_32v5
         select CPU_ABRT_EV5TJ
         select CPU_PABRT_NOIFAR