diff options
author | Tony Lindgren <tony@atomide.com> | 2011-06-29 03:35:18 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 03:35:18 -0700 |
commit | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (patch) | |
tree | 8627f57b3c43f3612c91760292f7e7d1b47eb3d1 /arch/arm/mach-omap2/pm34xx.c | |
parent | bafe2721a0fbd1cc1af04384133684f660f3658e (diff) | |
parent | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (diff) | |
download | linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.tar.bz2 |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index c155c9d1c82c..4cb636af7045 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -534,10 +534,6 @@ static int omap3_pm_suspend(void) struct power_state *pwrst; int state, ret = 0; - if (wakeup_timer_seconds || wakeup_timer_milliseconds) - omap2_pm_wakeup_on_timer(wakeup_timer_seconds, - wakeup_timer_milliseconds); - /* Read current next_pwrsts */ list_for_each_entry(pwrst, &pwrst_list, node) pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm); |