commit e9d728f528f9548c8dd013899b23e662fa7b6bca
author Paul Mundt <lethal@linux-sh.org> Fri Jan 07 10:51:35 2011 +0900
committer Paul Mundt <lethal@linux-sh.org> Fri Jan 07 10:51:35 2011 +0900
tree d88a5df6e5a2b33ebe088ad0223fe54679a59df3
parent 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1
parent 6155f77d09b968f591876f368d4843168910449e

Merge branch 'rmobile/smp' into rmobile-latest

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-shmobile/include/mach/entry-macro-intc.S

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

arch/arm/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7daab42..e2f8011 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1258,7 +1258,7 @@
 	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
 		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
 		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
-		 ARCH_MSM_SCORPIONMP
+		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE
 	select USE_GENERIC_SMP_HELPERS
 	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
 	help