[PATCH] arm: omap4: allow disabling MPU local timer if 32K timer is enabled

[Ming Lei]

With 32K gp timer, tick can be driven and system can run well, so
allow MPU local timer to be disabled if someone requires it, otherwise
MPU local timer is always chosen as the default clock_event_device.

Signed-off-by: Ming Lei <tom.leiming at gmail.com>
---
 arch/arm/mach-omap2/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index d965da4..12cd602 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -46,7 +46,7 @@ config ARCH_OMAP4
 	select CPU_V7
 	select ARM_GIC
 	select HAVE_SMP
-	select LOCAL_TIMERS if SMP
+	select LOCAL_TIMERS if (SMP && !OMAP_32K_TIMER)
 	select PL310_ERRATA_588369
 	select PL310_ERRATA_727915
 	select ARM_ERRATA_720789
-- 
1.7.9