From bb4092274e5be34eee3ad6768564b2f52081dcb7 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 27 Sep 2006 18:00:35 +0100
Subject: [PATCH] --- yaml --- r: 36685 b: refs/heads/master c:
 6cc7cbef948ea2660cc40d7aab090a479f7db6a2 h: refs/heads/master i:   36683:
 0dd78cdf3963eaa7dc944a9989285e2f7d698f59 v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-arm/cacheflush.h | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 757df950d56c..04759ee3aeab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b237a355afd342509f1471e0c338637bcd958bc
+refs/heads/master: 6cc7cbef948ea2660cc40d7aab090a479f7db6a2
diff --git a/trunk/include/asm-arm/cacheflush.h b/trunk/include/asm-arm/cacheflush.h
index b611a8ea0bb2..f0845646aacb 100644
--- a/trunk/include/asm-arm/cacheflush.h
+++ b/trunk/include/asm-arm/cacheflush.h
@@ -25,8 +25,7 @@
 #undef _CACHE
 #undef MULTI_CACHE
 
-#if defined(CONFIG_CPU_ARM610) || defined(CONFIG_CPU_ARM710) || \
-    defined(CONFIG_CPU_ARM740T)
+#if defined(CONFIG_CPU_CACHE_V3)
 # ifdef _CACHE
 #  define MULTI_CACHE 1
 # else
@@ -34,8 +33,7 @@
 # endif
 #endif
 
-#if defined(CONFIG_CPU_ARM720T) || defined(CONFIG_CPU_ARM7TDMI) || \
-    defined(CONFIG_CPU_ARM9TDMI)
+#if defined(CONFIG_CPU_CACHE_V4)
 # ifdef _CACHE
 #  define MULTI_CACHE 1
 # else
@@ -72,7 +70,7 @@
 # endif
 #endif
 
-#if defined(CONFIG_CPU_SA110) || defined(CONFIG_CPU_SA1100)
+#if defined(CONFIG_CPU_CACHE_V4WB)
 # ifdef _CACHE
 #  define MULTI_CACHE 1
 # else