diff options
| author |   Tony Lindgren <tony@atomide.com> | 2011-10-06 17:05:51 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-04 18:07:15 -0700 |
| commit | be26a008414414c69a4ae9fe9877401c3ba62c5a (patch) | |
| tree | f3cf7ef42e655eef98fdcc3f5f1ece89124c9658 /arch | |
| parent | ARM: OMAP2+: timer: Remove omap_device_pm_latency (diff) | |
| download | linux-dev-be26a008414414c69a4ae9fe9877401c3ba62c5a.tar.xz linux-dev-be26a008414414c69a4ae9fe9877401c3ba62c5a.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap1/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |