diff --git a/[refs] b/[refs] index d0b051dd14fe..36faff7813d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c51ed4fb9f11fa1e0873aa2d5b28f42a85ac299 +refs/heads/master: 4d7ec69576ca4427478405190bd32e560f06fe99 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 81c71daf1a90..05675c14ddf5 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -1211,7 +1211,8 @@ config SMP depends on GENERIC_CLOCKEVENTS 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_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \ + ARCH_SHMOBILE select USE_GENERIC_SMP_HELPERS select HAVE_ARM_SCU help