diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-26 19:10:11 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-26 19:10:11 -0400 |
| commit | 542f869f1826f092606efd0c4c771f070d1314f5 (patch) | |
| tree | 9c9d265ab0c87ea7862ccb70933f33d3d7011334 /arch/arm/include/asm/proc-fns.h | |
| parent | e8b374bb6c888a70530d800c9e2fcd153e2c325d (diff) | |
| parent | 839e642f3dda44a35c6a91780bff41d84c288022 (diff) | |
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
Conflicts:
arch/arm/mm/Kconfig
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/proc-fns.h')
| -rw-r--r-- | arch/arm/include/asm/proc-fns.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h index c6250311550b..3976412685f8 100644 --- a/arch/arm/include/asm/proc-fns.h +++ b/arch/arm/include/asm/proc-fns.h | |||
| @@ -89,6 +89,14 @@ | |||
| 89 | # define CPU_NAME cpu_arm922 | 89 | # define CPU_NAME cpu_arm922 |
| 90 | # endif | 90 | # endif |
| 91 | # endif | 91 | # endif |
| 92 | # ifdef CONFIG_CPU_FA526 | ||
| 93 | # ifdef CPU_NAME | ||
| 94 | # undef MULTI_CPU | ||
| 95 | # define MULTI_CPU | ||
| 96 | # else | ||
| 97 | # define CPU_NAME cpu_fa526 | ||
| 98 | # endif | ||
| 99 | # endif | ||
| 92 | # ifdef CONFIG_CPU_ARM925T | 100 | # ifdef CONFIG_CPU_ARM925T |
| 93 | # ifdef CPU_NAME | 101 | # ifdef CPU_NAME |
| 94 | # undef MULTI_CPU | 102 | # undef MULTI_CPU |