diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 02:35:26 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 02:35:26 +0300 |
| commit | bd1274dc005c2cee41771a7cc616f4709a6e6323 (patch) | |
| tree | fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca /arch/arm/include/asm/glue-proc.h | |
| parent | 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (diff) | |
| parent | 3ba6e69ad887f8a814267ed36fd4bfbddf8855a9 (diff) | |
| download | linux-bd1274dc005c2cee41771a7cc616f4709a6e6323.tar.xz | |
Merge branch 'v6v7' into devel
Conflicts:
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/proc-fns.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/include/asm/glue-proc.h')
| -rw-r--r-- | arch/arm/include/asm/glue-proc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/glue-proc.h b/arch/arm/include/asm/glue-proc.h index 6469521d092f..e2be7f142668 100644 --- a/arch/arm/include/asm/glue-proc.h +++ b/arch/arm/include/asm/glue-proc.h @@ -230,7 +230,7 @@ # endif #endif -#ifdef CONFIG_CPU_V6 +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) # ifdef CPU_NAME # undef MULTI_CPU # define MULTI_CPU |