diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-29 07:45:16 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 07:45:16 -0400 |
| commit | 48cb1258e8b0f8c81cfb699b42326c5b2147b3f8 (patch) | |
| tree | 6dc560f24eec8d303534d86b1e20d037df94a68d /arch/arm/mach-omap2/pm34xx.c | |
| parent | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (diff) | |
| parent | ec3cdb5baedf6bb3852c531426c1e95a13671dff (diff) | |
Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-cleanup
Conflicts:
arch/arm/mach-omap2/pm-debug.c
arch/arm/mach-omap2/pm.h
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 4cb636af7045..96a76245284c 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
| @@ -497,8 +497,6 @@ console_still_active: | |||
| 497 | 497 | ||
| 498 | int omap3_can_sleep(void) | 498 | int omap3_can_sleep(void) |
| 499 | { | 499 | { |
| 500 | if (!sleep_while_idle) | ||
| 501 | return 0; | ||
| 502 | if (!omap_uart_can_sleep()) | 500 | if (!omap_uart_can_sleep()) |
| 503 | return 0; | 501 | return 0; |
| 504 | return 1; | 502 | return 1; |