diff --git a/[refs] b/[refs] index 97adbc18e83a..cb123b01956f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3af8a8dad07527b25055b8b4c2a2b0d69362e7fb +refs/heads/master: ce45947b5687918dc6ce8e31938fbfd4059bf89e diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index e3956042892c..05fc7cf6711d 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -1196,7 +1196,7 @@ config LOCAL_TIMERS REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA) default y - select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\ + select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\ ARCH_U8500 || ARCH_TEGRA help Enable support for local timers on SMP platforms, rather then the