ENGR00278098 Make gpu modulable driver passing build

Gpu driver requires to do cache invalid, clean and flush operation.
 But in 3.10 kernel, these APIs are not supposed to be called from
 device driver. To avoid too much code change, Revert "ARM: Fix bad
 merge bd1274dc005 (Merge branch 'v6v7' into devel)" to make the
 situation the same as 3.0.35 kernel.

This reverts commit a67e1ce145785d884b29b17e4d82a6ecd67bb97a.

Signed-off-by: Loren HUANG <b02279@freescale.com>
Acked-by: Shawn Guo

diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
index a3c24cd5b7c8ee94e9f36a73abf00c340a747ca0..ec75c883c7f59a0a90623455d69b3261592be0a0 100644 (file)
--- a/arch/arm/include/asm/glue-cache.h
+++ b/arch/arm/include/asm/glue-cache.h
@@ -102,19 +102,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(CONFIG_CPU_V7M)