From aff95eedad6983cc0edc2c28fd469643bd727520 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 2 Sep 2012 09:17:09 +0100
Subject: [PATCH] --- yaml --- r: 331487 b: refs/heads/master c:
 a67e1ce145785d884b29b17e4d82a6ecd67bb97a h: refs/heads/master i:   331485:
 2ca6c49e6734e49dddf5af174cfad1b7fc39aa01   331483:
 35b5b833560770f5cc0f63265a3430a6b3d84008   331479:
 7c172804197e41025da3fe9893132286685f05ee   331471:
 ead64601451b7d77e329d1ce9356dca740f7943e   331455:
 d06bfff7c9f22b7046525d351493c8cf45f03f26 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm/include/asm/glue-cache.h | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b2c98c37325f..de75b768ef97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 195bbcac2e5c12f7fb99cdcc492c3000c5537f4a
+refs/heads/master: a67e1ce145785d884b29b17e4d82a6ecd67bb97a
diff --git a/trunk/arch/arm/include/asm/glue-cache.h b/trunk/arch/arm/include/asm/glue-cache.h
index 7e30874377e6..4f8d2c0dc441 100644
--- a/trunk/arch/arm/include/asm/glue-cache.h
+++ b/trunk/arch/arm/include/asm/glue-cache.h
@@ -110,19 +110,19 @@
 #endif
 
 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
-//# ifdef _CACHE
+# ifdef _CACHE
 #  define MULTI_CACHE 1
-//# else
-//#  define _CACHE v6
-//# endif
+# else
+#  define _CACHE v6
+# endif
 #endif
 
 #if defined(CONFIG_CPU_V7)
-//# ifdef _CACHE
+# ifdef _CACHE
 #  define MULTI_CACHE 1
-//# else
-//#  define _CACHE v7
-//# endif
+# else
+#  define _CACHE v7
+# endif
 #endif
 
 #if !defined(_CACHE) && !defined(MULTI_CACHE)