ARM: OMAP1: Fix warnings about enabling 32 KiHz timer

tmlind · tmlind · commit be26a0084144 · 2011-11-04T18:07:15.000-07:00
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 &lt;tony@atomide.com&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void omap1_pm_idle(void)`
`116`	`116`	`return;`
`117`	`117`	`}`
`118`	`118`
`119`		`-#ifdef CONFIG_OMAP_MPU_TIMER`
	`119`	`+#if defined(CONFIG_OMAP_MPU_TIMER) && !defined(CONFIG_OMAP_DM_TIMER)`
`120`	`120`	`#warning Enable 32kHz OS timer in order to allow sleep states in idle`
`121`	`121`	`use_idlect1 = use_idlect1 & ~(1 << 9);`
`122`	`122`	`#else`