소스 검색

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>
Tony Lindgren 13 년 전
부모
커밋
be26a00841
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      arch/arm/mach-omap1/pm.c

+ 1 - 1
arch/arm/mach-omap1/pm.c

@@ -116,7 +116,7 @@ void omap1_pm_idle(void)
 		return;
 		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
 #warning Enable 32kHz OS timer in order to allow sleep states in idle
 	use_idlect1 = use_idlect1 & ~(1 << 9);
 	use_idlect1 = use_idlect1 & ~(1 << 9);
 #else
 #else