diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 12:55:53 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 12:55:53 -0400 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /include/asm-arm/proc-fns.h | |
| parent | 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff) | |
| parent | 82965addad66fce61a92c5f03104ea90b0b87124 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-arm/proc-fns.h')
| -rw-r--r-- | include/asm-arm/proc-fns.h | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/include/asm-arm/proc-fns.h b/include/asm-arm/proc-fns.h index 1bde92cdaebd..ea7e54c319be 100644 --- a/include/asm-arm/proc-fns.h +++ b/include/asm-arm/proc-fns.h | |||
| @@ -33,6 +33,14 @@ | |||
| 33 | # define CPU_NAME cpu_arm6 | 33 | # define CPU_NAME cpu_arm6 |
| 34 | # endif | 34 | # endif |
| 35 | # endif | 35 | # endif |
| 36 | # ifdef CONFIG_CPU_ARM7TDMI | ||
| 37 | # ifdef CPU_NAME | ||
| 38 | # undef MULTI_CPU | ||
| 39 | # define MULTI_CPU | ||
| 40 | # else | ||
| 41 | # define CPU_NAME cpu_arm7tdmi | ||
| 42 | # endif | ||
| 43 | # endif | ||
| 36 | # ifdef CONFIG_CPU_ARM710 | 44 | # ifdef CONFIG_CPU_ARM710 |
| 37 | # ifdef CPU_NAME | 45 | # ifdef CPU_NAME |
| 38 | # undef MULTI_CPU | 46 | # undef MULTI_CPU |
| @@ -49,6 +57,22 @@ | |||
| 49 | # define CPU_NAME cpu_arm720 | 57 | # define CPU_NAME cpu_arm720 |
| 50 | # endif | 58 | # endif |
| 51 | # endif | 59 | # endif |
| 60 | # ifdef CONFIG_CPU_ARM740T | ||
| 61 | # ifdef CPU_NAME | ||
| 62 | # undef MULTI_CPU | ||
| 63 | # define MULTI_CPU | ||
| 64 | # else | ||
| 65 | # define CPU_NAME cpu_arm740 | ||
| 66 | # endif | ||
| 67 | # endif | ||
| 68 | # ifdef CONFIG_CPU_ARM9TDMI | ||
| 69 | # ifdef CPU_NAME | ||
| 70 | # undef MULTI_CPU | ||
| 71 | # define MULTI_CPU | ||
| 72 | # else | ||
| 73 | # define CPU_NAME cpu_arm9tdmi | ||
| 74 | # endif | ||
| 75 | # endif | ||
| 52 | # ifdef CONFIG_CPU_ARM920T | 76 | # ifdef CONFIG_CPU_ARM920T |
| 53 | # ifdef CPU_NAME | 77 | # ifdef CPU_NAME |
| 54 | # undef MULTI_CPU | 78 | # undef MULTI_CPU |
| @@ -81,6 +105,22 @@ | |||
| 81 | # define CPU_NAME cpu_arm926 | 105 | # define CPU_NAME cpu_arm926 |
| 82 | # endif | 106 | # endif |
| 83 | # endif | 107 | # endif |
| 108 | # ifdef CONFIG_CPU_ARM940T | ||
| 109 | # ifdef CPU_NAME | ||
| 110 | # undef MULTI_CPU | ||
| 111 | # define MULTI_CPU | ||
| 112 | # else | ||
| 113 | # define CPU_NAME cpu_arm940 | ||
| 114 | # endif | ||
| 115 | # endif | ||
| 116 | # ifdef CONFIG_CPU_ARM946E | ||
| 117 | # ifdef CPU_NAME | ||
| 118 | # undef MULTI_CPU | ||
| 119 | # define MULTI_CPU | ||
| 120 | # else | ||
| 121 | # define CPU_NAME cpu_arm946 | ||
| 122 | # endif | ||
| 123 | # endif | ||
| 84 | # ifdef CONFIG_CPU_SA110 | 124 | # ifdef CONFIG_CPU_SA110 |
| 85 | # ifdef CPU_NAME | 125 | # ifdef CPU_NAME |
| 86 | # undef MULTI_CPU | 126 | # undef MULTI_CPU |