commit abc3f126ac736280c68db6472eb0040ddf6e1b1f
author Arnd Bergmann <arnd@arndb.de> Wed Nov 02 02:46:55 2011 +0100
committer Arnd Bergmann <arnd@arndb.de> Wed Nov 02 02:46:55 2011 +0100
tree 4e3333cde6da6c49dcd81920410bf5a33055f03a
parent b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea
parent 8bcb97659656042f3132b2814b19709856aa1335

Merge branch 'imx/imx6q' into next/soc

Conflicts:
	Documentation/devicetree/bindings/arm/fsl.txt
	arch/arm/Kconfig
	arch/arm/Kconfig.debug
	arch/arm/plat-mxc/include/mach/common.h

arch/arm/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4fe1db17..f41fe7a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1435,7 +1435,7 @@
 	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
 		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
 		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
-		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK
+		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q
 	select USE_GENERIC_SMP_HELPERS
 	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
 	help