From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 27 Sep 2006 17:00:35 +0000 (+0100)
Subject: [ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
X-Git-Tag: v2.6.19-rc1~885^2^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6cc7cbef948ea2660cc40d7aab090a479f7db6a2;p=linux-2.6-omap-h63xx.git

[ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h

Three of the generic cache method options were using explicit CPU
types, whereas they could use the CPU_CACHE_* definitions instead.
Switch them over to use the CPU_CACHE_* definitions.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h
index b611a8ea0bb..f0845646aac 100644
--- a/include/asm-arm/cacheflush.h
+++ b/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