1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 7d0614f599a7..d9b4c42d62ff 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -116,20 +116,20 @@
 # define MULTI_CACHE 1
 #endif
-#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
+#if defined(CONFIG_CPU_CACHE_V6)
-//# ifdef _CACHE
+# ifdef _CACHE
 #  define MULTI_CACHE 1
-//# else
+# else
-//#  define _CACHE v6
+#  define _CACHE v6
-//# endif
+# endif
 #endif
-#if defined(CONFIG_CPU_V7)
+#if defined(CONFIG_CPU_CACHE_V7)
-//# ifdef _CACHE
+# ifdef _CACHE
 #  define MULTI_CACHE 1
-//# else
+# else
-//#  define _CACHE v7
+#  define _CACHE v7
-//# endif
+# endif
 #endif
 #if !defined(_CACHE) && !defined(MULTI_CACHE)

diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 7d0614f599a7..d9b4c42d62ff 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h
@@ -116,20 +116,20 @@
116	# define MULTI_CACHE 1	116	# define MULTI_CACHE 1
117	#endif	117	#endif
118		118
119	#if defined(CONFIG_CPU_V6) \|\| defined(CONFIG_CPU_V6K)	119	#if defined(CONFIG_CPU_CACHE_V6)
120	//# ifdef _CACHE	120	# ifdef _CACHE
121	# define MULTI_CACHE 1	121	# define MULTI_CACHE 1
122	//# else	122	# else
123	//# define _CACHE v6	123	# define _CACHE v6
124	//# endif	124	# endif
125	#endif	125	#endif
126		126
127	#if defined(CONFIG_CPU_V7)	127	#if defined(CONFIG_CPU_CACHE_V7)
128	//# ifdef _CACHE	128	# ifdef _CACHE
129	# define MULTI_CACHE 1	129	# define MULTI_CACHE 1
130	//# else	130	# else
131	//# define _CACHE v7	131	# define _CACHE v7
132	//# endif	132	# endif
133	#endif	133	#endif
134		134
135	#if !defined(_CACHE) && !defined(MULTI_CACHE)	135	#if !defined(_CACHE) && !defined(MULTI_CACHE)