git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
proc-xsc3.S
diff --git
a/arch/arm/mm/proc-xsc3.S
b/arch/arm/mm/proc-xsc3.S
index
b0d5786
..
a2d1e86
100644
(file)
--- a/
arch/arm/mm/proc-xsc3.S
+++ b/
arch/arm/mm/proc-xsc3.S
@@
-410,7
+410,7
@@
ENTRY(cpu_xsc3_set_pte_ext)
.globl cpu_xsc3_suspend_size
.equ cpu_xsc3_suspend_size, 4 * 6
-#ifdef CONFIG_
PM_SLEEP
+#ifdef CONFIG_
ARM_CPU_SUSPEND
ENTRY(cpu_xsc3_do_suspend)
stmfd sp!, {r4 - r9, lr}
mrc p14, 0, r4, c6, c0, 0 @ clock configuration, for turbo mode