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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
proc-sa1100.S
diff --git
a/arch/arm/mm/proc-sa1100.S
b/arch/arm/mm/proc-sa1100.S
index
74483d1
..
184a9c9
100644
(file)
--- a/
arch/arm/mm/proc-sa1100.S
+++ b/
arch/arm/mm/proc-sa1100.S
@@
-171,7
+171,7
@@
ENTRY(cpu_sa1100_set_pte_ext)
.globl cpu_sa1100_suspend_size
.equ cpu_sa1100_suspend_size, 4*4
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
ENTRY(cpu_sa1100_do_suspend)
stmfd sp!, {r4 - r7, lr}
mrc p15, 0, r4, c3, c0, 0 @ domain ID