projects
/
powerpc.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 master.kernel.org:/home/rmk/linux-2.6-arm
[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
ea7e54c
..
5599d4e
100644
(file)
--- a/
include/asm-arm/proc-fns.h
+++ b/
include/asm-arm/proc-fns.h
@@
-193,6
+193,14
@@
# define CPU_NAME cpu_v6
# endif
# endif
+# ifdef CONFIG_CPU_V7
+# ifdef CPU_NAME
+# undef MULTI_CPU
+# define MULTI_CPU
+# else
+# define CPU_NAME cpu_v7
+# endif
+# endif
#endif
#ifndef __ASSEMBLY__