diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-29 06:44:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-29 06:44:43 -0400 |
| commit | 3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727 (patch) | |
| tree | d0f196c53d209f44190fd8a6481823b7770866e6 /arch/arm/include/asm/glue-proc.h | |
| parent | cbd379b10019617457bda31eb243890f4377fa3e (diff) | |
| parent | 809e660f438fc5a69bf57630a85bcd8112263f37 (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/Makefile
arch/arm/include/asm/glue-proc.h
Diffstat (limited to 'arch/arm/include/asm/glue-proc.h')
| -rw-r--r-- | arch/arm/include/asm/glue-proc.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/glue-proc.h b/arch/arm/include/asm/glue-proc.h index 8017e94acc5e..74a8b84f3cb1 100644 --- a/arch/arm/include/asm/glue-proc.h +++ b/arch/arm/include/asm/glue-proc.h | |||
| @@ -230,6 +230,15 @@ | |||
| 230 | # endif | 230 | # endif |
| 231 | #endif | 231 | #endif |
| 232 | 232 | ||
| 233 | #ifdef CONFIG_CPU_V7M | ||
| 234 | # ifdef CPU_NAME | ||
| 235 | # undef MULTI_CPU | ||
| 236 | # define MULTI_CPU | ||
| 237 | # else | ||
| 238 | # define CPU_NAME cpu_v7m | ||
| 239 | # endif | ||
| 240 | #endif | ||
| 241 | |||
| 233 | #ifdef CONFIG_CPU_PJ4B | 242 | #ifdef CONFIG_CPU_PJ4B |
| 234 | # ifdef CPU_NAME | 243 | # ifdef CPU_NAME |
| 235 | # undef MULTI_CPU | 244 | # undef MULTI_CPU |