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/mchehab/v4l-dvb
[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 1cc206ab5eae6a76378b79537d3fd7912805a01d..4343fdb0e9e55f453129f24b37c41e7d29e56cf8 100644
(file)
--- a/
arch/arm/mm/proc-arm1020e.S
+++ b/
arch/arm/mm/proc-arm1020e.S
@@
-452,6
+452,7
@@
arm1020e_crval:
.type arm1020e_processor_functions, #object
arm1020e_processor_functions:
.word v4t_early_abort
+ .word pabort_noifar
.word cpu_arm1020e_proc_init
.word cpu_arm1020e_proc_fin
.word cpu_arm1020e_reset