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 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
proc-xscale.S
diff --git
a/arch/arm/mm/proc-xscale.S
b/arch/arm/mm/proc-xscale.S
index
086038c
..
ce233bc
100644
(file)
--- a/
arch/arm/mm/proc-xscale.S
+++ b/
arch/arm/mm/proc-xscale.S
@@
-518,7
+518,7
@@
ENTRY(cpu_xscale_set_pte_ext)
.globl cpu_xscale_suspend_size
.equ cpu_xscale_suspend_size, 4 * 7
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
ENTRY(cpu_xscale_do_suspend)
stmfd sp!, {r4 - r10, lr}
mrc p14, 0, r4, c6, c0, 0 @ clock configuration, for turbo mode