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/gregkh/tty-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
proc-arm6_7.S
diff --git
a/arch/arm/mm/proc-arm6_7.S
b/arch/arm/mm/proc-arm6_7.S
index
64e0b32
..
6a7be18
100644
(file)
--- a/
arch/arm/mm/proc-arm6_7.S
+++ b/
arch/arm/mm/proc-arm6_7.S
@@
-238,7
+238,7
@@
ENTRY(cpu_arm7_reset)
mcr p15, 0, r1, c1, c0, 0 @ turn off MMU etc
mov pc, r0
- __INIT
+ __
CPU
INIT
.type __arm6_setup, #function
__arm6_setup: mov r0, #0