projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream
[powerpc.git]
/
include
/
asm-arm
/
proc-fns.h
diff --git
a/include/asm-arm/proc-fns.h
b/include/asm-arm/proc-fns.h
index
87f3ea9
..
ea7e54c
100644
(file)
--- a/
include/asm-arm/proc-fns.h
+++ b/
include/asm-arm/proc-fns.h
@@
-113,6
+113,14
@@
# define CPU_NAME cpu_arm940
# endif
# endif
+# ifdef CONFIG_CPU_ARM946E
+# ifdef CPU_NAME
+# undef MULTI_CPU
+# define MULTI_CPU
+# else
+# define CPU_NAME cpu_arm946
+# endif
+# endif
# ifdef CONFIG_CPU_SA110
# ifdef CPU_NAME
# undef MULTI_CPU