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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
proc-arm740.S
diff --git
a/arch/arm/mm/proc-arm740.S
b/arch/arm/mm/proc-arm740.S
index
6c1a9ab
..
38b27dc
100644
(file)
--- a/
arch/arm/mm/proc-arm740.S
+++ b/
arch/arm/mm/proc-arm740.S
@@
-55,7
+55,7
@@
ENTRY(cpu_arm740_reset)
mcr p15, 0, ip, c1, c0, 0 @ ctrl register
mov pc, r0
- __INIT
+ __
CPU
INIT
.type __arm740_setup, #function
__arm740_setup: