Merge branch 'v6v7' into devel

[~andy/linux] / arch / arm / include / asm / glue-proc.h

diff --git a/arch/arm/include/asm/glue-proc.h b/arch/arm/include/asm/glue-proc.h
index 6469521d092f028610aacd8ea1bba8f90c6cf3dc..e2be7f1426687f10c89a3f8e31d2b2c63943de62 100644 (file)
--- 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