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 branches 'upstream' and 'upstream-fixes' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
proc-xscale.S
diff --git
a/arch/arm/mm/proc-xscale.S
b/arch/arm/mm/proc-xscale.S
index
1407597
..
cb245ed
100644
(file)
--- a/
arch/arm/mm/proc-xscale.S
+++ b/
arch/arm/mm/proc-xscale.S
@@
-506,7
+506,7
@@
ENTRY(cpu_xscale_set_pte_ext)
.align
- __INIT
+ __
CPU
INIT
.type __xscale_setup, #function
__xscale_setup: