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 'master' of git://git.infradead.org/users/linville/wireless-next into...
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
proc-arm926.S
diff --git
a/arch/arm/mm/proc-arm926.S
b/arch/arm/mm/proc-arm926.S
index
2bbcf05
..
cd8f79c
100644
(file)
--- a/
arch/arm/mm/proc-arm926.S
+++ b/
arch/arm/mm/proc-arm926.S
@@
-394,7
+394,7
@@
ENTRY(cpu_arm926_set_pte_ext)
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
.globl cpu_arm926_suspend_size
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
.globl cpu_arm926_suspend_size
-.equ cpu_arm926_suspend_size, 4 *
3
+.equ cpu_arm926_suspend_size, 4 *
4
#ifdef CONFIG_PM_SLEEP
ENTRY(cpu_arm926_do_suspend)
stmfd sp!, {r4 - r7, lr}
#ifdef CONFIG_PM_SLEEP
ENTRY(cpu_arm926_do_suspend)
stmfd sp!, {r4 - r7, lr}