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 'staging-next' into Linux 3.1
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
proc-arm920.S
diff --git
a/arch/arm/mm/proc-arm920.S
b/arch/arm/mm/proc-arm920.S
index
92bd102
..
2e6849b
100644
(file)
--- a/
arch/arm/mm/proc-arm920.S
+++ b/
arch/arm/mm/proc-arm920.S
@@
-379,7
+379,7
@@
ENTRY(cpu_arm920_set_pte_ext)
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
.globl cpu_arm920_suspend_size
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
.globl cpu_arm920_suspend_size
-.equ cpu_arm920_suspend_size, 4 *
3
+.equ cpu_arm920_suspend_size, 4 *
4
#ifdef CONFIG_PM_SLEEP
ENTRY(cpu_arm920_do_suspend)
stmfd sp!, {r4 - r7, lr}
#ifdef CONFIG_PM_SLEEP
ENTRY(cpu_arm920_do_suspend)
stmfd sp!, {r4 - r7, lr}