diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 02:56:34 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 02:56:34 -0500 |
| commit | 8ec46b97f24d60645c8f708c87e0caecebd25d77 (patch) | |
| tree | 3663c411f7a4e7a9bfc0a8e720679b93a5860b7c /arch/arm/Kconfig | |
| parent | b85b64cc22122adca695e0f8c340cc677ad92e8c (diff) | |
| parent | 6938d75a8c1a1752f9fa7ef14a0c570036c7b73b (diff) | |
Merge branch 'next/mct-exynos' into next/clk-exynos
Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 46fcfa8805f8..ee414be31b4d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1655,7 +1655,7 @@ config LOCAL_TIMERS | |||
| 1655 | bool "Use local timer interrupts" | 1655 | bool "Use local timer interrupts" |
| 1656 | depends on SMP | 1656 | depends on SMP |
| 1657 | default y | 1657 | default y |
| 1658 | select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT) | 1658 | select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !CLKSRC_EXYNOS_MCT) |
| 1659 | help | 1659 | help |
| 1660 | Enable support for local timers on SMP platforms, rather then the | 1660 | Enable support for local timers on SMP platforms, rather then the |
| 1661 | legacy IPI broadcast method. Local timers allows the system | 1661 | legacy IPI broadcast method. Local timers allows the system |