commit bd1274dc005c2cee41771a7cc616f4709a6e6323
author Russell King <rmk+kernel@arm.linux.org.uk> Wed Mar 16 23:35:26 2011 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Mar 16 23:35:26 2011 +0000
tree fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca
parent 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd
parent 3ba6e69ad887f8a814267ed36fd4bfbddf8855a9

Merge branch 'v6v7' into devel

Conflicts:
	arch/arm/include/asm/cacheflush.h
	arch/arm/include/asm/proc-fns.h
	arch/arm/mm/Kconfig

arch/arm/include/asm/glue-cache.h

diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
index 0591d350..c7afbc5 100644
--- a/arch/arm/include/asm/glue-cache.h
+++ b/arch/arm/include/asm/glue-cache.h
@@ -109,7 +109,7 @@
 # define MULTI_CACHE 1
 #endif
 
-#if defined(CONFIG_CPU_V6)
+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
 //# ifdef _CACHE
 #  define MULTI_CACHE 1
 //# else