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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
proc-fns.h
diff --git
a/arch/arm/include/asm/proc-fns.h
b/arch/arm/include/asm/proc-fns.h
index
c625031
..
3976412
100644
(file)
--- a/
arch/arm/include/asm/proc-fns.h
+++ b/
arch/arm/include/asm/proc-fns.h
@@
-89,6
+89,14
@@
# define CPU_NAME cpu_arm922
# endif
# endif
+# ifdef CONFIG_CPU_FA526
+# ifdef CPU_NAME
+# undef MULTI_CPU
+# define MULTI_CPU
+# else
+# define CPU_NAME cpu_fa526
+# endif
+# endif
# ifdef CONFIG_CPU_ARM925T
# ifdef CPU_NAME
# undef MULTI_CPU