summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/cpuidle34xx.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-12-17 02:01:03 +0400
committerTony Lindgren <tony@atomide.com>2011-12-17 02:01:03 +0400
commit7f760f1abcd1a36b52776c90f6a601dd90f06ecb (patch)
treec5f29a48b528ecc352dbc5c2a246d7860177ac59 /arch/arm/mach-omap2/cpuidle34xx.c
parent9d297f5ee1b92a84e2cd6c547c3ac1f893128359 (diff)
parentda27468655540b083525177f5dc6f3b1f6e3b869 (diff)
downloadlinux-7f760f1abcd1a36b52776c90f6a601dd90f06ecb.tar.xz
Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart
Conflicts: arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/arm/mach-omap2/cpuidle34xx.c')
-rw-r--r--arch/arm/mach-omap2/cpuidle34xx.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index 1f71ebb6c12c..464cffde58fe 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -31,7 +31,6 @@
#include <plat/irqs.h>
#include "powerdomain.h"
#include "clockdomain.h"
-#include <plat/serial.h>
#include "pm.h"
#include "control.h"
@@ -260,11 +259,6 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
struct omap3_idle_statedata *cx;
int ret;
- if (!omap3_can_sleep()) {
- new_state_idx = drv->safe_state_index;
- goto select_state;
- }
-
/*
* Prevent idle completely if CAM is active.
* CAM does not have wakeup capability in OMAP3.