aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/glue-proc.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-16 23:35:26 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-16 23:35:26 +0000
commitbd1274dc005c2cee41771a7cc616f4709a6e6323 (patch)
treefcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca /arch/arm/include/asm/glue-proc.h
parent1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (diff)
parent3ba6e69ad887f8a814267ed36fd4bfbddf8855a9 (diff)
downloadvexpress-lsk-bd1274dc005c2cee41771a7cc616f4709a6e6323.tar.gz
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.h2
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 6469521d092..e2be7f14266 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