git.samba.org
/
sfrench
/
cifs-2.6.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/usb-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mm
/
proc-arm1020e.S
diff --git
a/arch/arm/mm/proc-arm1020e.S
b/arch/arm/mm/proc-arm1020e.S
index 1a511e765909957d81b463c17f0000b8893d3770..afc06b9c31332bf7dc25222855d61dcb391bc42d 100644
(file)
--- a/
arch/arm/mm/proc-arm1020e.S
+++ b/
arch/arm/mm/proc-arm1020e.S
@@
-412,7
+412,7
@@
ENTRY(cpu_arm1020e_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __INIT
+ __
CPU
INIT
.type __arm1020e_setup, #function
__arm1020e_setup: