From: Tony Lindgren <tony@atomide.com>
Date: Fri, 7 Oct 2011 00:05:51 +0000 (-0700)
Subject: ARM: OMAP1: Fix warnings about enabling 32 KiHz timer
X-Git-Tag: MMI-PSA29.97-13-9~18066^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=be26a008414414c69a4ae9fe9877401c3ba62c5a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ARM: OMAP1: Fix warnings about enabling 32 KiHz timer

Fix "Enable 32kHz OS timer in order to allow sleep states in idle"
warning. We are now compiling in bothe MPU timer and 32 KiHz timer,
so this warning is only valid when MPU_TIMER is set and OMAP_DM_TIMER
is not set.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 495b3987d461..89ea20ca0ccc 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -116,7 +116,7 @@ void omap1_pm_idle(void)
 		return;
 	}
 
-#ifdef CONFIG_OMAP_MPU_TIMER
+#if defined(CONFIG_OMAP_MPU_TIMER) && !defined(CONFIG_OMAP_DM_TIMER)
 #warning Enable 32kHz OS timer in order to allow sleep states in idle
 	use_idlect1 = use_idlect1 & ~(1 << 9);
 #else