diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
| commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
| tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /include/asm-arm/proc-fns.h | |
| parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-arm/proc-fns.h')
| -rw-r--r-- | include/asm-arm/proc-fns.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-arm/proc-fns.h b/include/asm-arm/proc-fns.h index 7bef2bf6be51..106045edb862 100644 --- a/include/asm-arm/proc-fns.h +++ b/include/asm-arm/proc-fns.h | |||
| @@ -138,6 +138,14 @@ | |||
| 138 | # define CPU_NAME cpu_xscale | 138 | # define CPU_NAME cpu_xscale |
| 139 | # endif | 139 | # endif |
| 140 | # endif | 140 | # endif |
| 141 | # ifdef CONFIG_CPU_XSC3 | ||
| 142 | # ifdef CPU_NAME | ||
| 143 | # undef MULTI_CPU | ||
| 144 | # define MULTI_CPU | ||
| 145 | # else | ||
| 146 | # define CPU_NAME cpu_xsc3 | ||
| 147 | # endif | ||
| 148 | # endif | ||
| 141 | # ifdef CONFIG_CPU_V6 | 149 | # ifdef CONFIG_CPU_V6 |
| 142 | # ifdef CPU_NAME | 150 | # ifdef CPU_NAME |
| 143 | # undef MULTI_CPU | 151 | # undef MULTI_CPU |