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 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[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
219980e
..
bf8a1d1
100644
(file)
--- a/
arch/arm/mm/proc-arm920.S
+++ b/
arch/arm/mm/proc-arm920.S
@@
-53,7
+53,7
@@
/*
* This is the size at which it becomes more efficient to
* clean the whole cache, rather than using the individual
/*
* This is the size at which it becomes more efficient to
* clean the whole cache, rather than using the individual
- * cache line maint
aine
nce instructions.
+ * cache line maint
ena
nce instructions.
*/
#define CACHE_DLIMIT 65536
*/
#define CACHE_DLIMIT 65536
@@
-390,7
+390,7
@@
ENTRY(cpu_arm920_set_pte_ext)
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
.globl cpu_arm920_suspend_size
.equ cpu_arm920_suspend_size, 4 * 3
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
.globl cpu_arm920_suspend_size
.equ cpu_arm920_suspend_size, 4 * 3
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
ENTRY(cpu_arm920_do_suspend)
stmfd sp!, {r4 - r7, lr}
mrc p15, 0, r4, c13, c0, 0 @ PID
ENTRY(cpu_arm920_do_suspend)
stmfd sp!, {r4 - r7, lr}
mrc p15, 0, r4, c13, c0, 0 @ PID