summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-01 21:09:39 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-01 21:09:39 +0200
commit15e0d9e37c7fe9711b60f47221c394d45553ad8c (patch)
treefd46b3ef48612d8c39a80627ee5c8fa9c422e15e /arch/arm/mm
parent82b9c18dc0ee38b5c78c5d09b9cffc79d98613c5 (diff)
downloadop-kernel-dev-15e0d9e37c7fe9711b60f47221c394d45553ad8c.zip
op-kernel-dev-15e0d9e37c7fe9711b60f47221c394d45553ad8c.tar.gz
ARM: pm: let platforms select cpu_suspend support
Support for the cpu_suspend functions is only built-in when CONFIG_PM_SLEEP is enabled, but omap3/4, exynos4 and pxa always call cpu_suspend when CONFIG_PM is enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/proc-v7.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index a30e785..591accd 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -217,7 +217,7 @@ ENDPROC(cpu_v7_set_pte_ext)
/* Suspend/resume support: derived from arch/arm/mach-s5pv210/sleep.S */
.globl cpu_v7_suspend_size
.equ cpu_v7_suspend_size, 4 * 9
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_ARM_CPU_SUSPEND
ENTRY(cpu_v7_do_suspend)
stmfd sp!, {r4 - r11, lr}
mrc p15, 0, r4, c13, c0, 0 @ FCSE/PID
OpenPOWER on IntegriCloud