From 3a85b081c29e5e9c85adc66fce8c4e0b605ef36a Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 6 Oct 2011 17:05:51 -0700
Subject: [PATCH] --- yaml --- r: 275142 b: refs/heads/master c:
 be26a008414414c69a4ae9fe9877401c3ba62c5a h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mach-omap1/pm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9d63f7da2e17..511a7fa8d572 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c16ae1e64e292054bc4c5a20724b40217bdc43dd
+refs/heads/master: be26a008414414c69a4ae9fe9877401c3ba62c5a
diff --git a/trunk/arch/arm/mach-omap1/pm.c b/trunk/arch/arm/mach-omap1/pm.c
index 495b3987d461..89ea20ca0ccc 100644
--- a/trunk/arch/arm/mach-omap1/pm.c
+++ b/trunk/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