Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...

[linux-2.6-omap-h63xx.git] / include / asm-mips / mach-ip22 / cpu-feature-overrides.h

diff --git a/include/asm-mips/mach-ip22/cpu-feature-overrides.h b/include/asm-mips/mach-ip22/cpu-feature-overrides.h
index ab97146681771a852eedd0643ab1e5af59bc92bb..f7c5dc8a5336663c3b2fe1f3443e3ace396a5f40 100644 (file)
--- a/include/asm-mips/mach-ip22/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-ip22/cpu-feature-overrides.h
@@ -13,7 +13,7 @@
  */
 #define cpu_has_tlb            1
 #define cpu_has_4kex           1
-#define cpu_has_4kcache                1
+#define cpu_has_4k_cache       1
 #define cpu_has_fpu            1
 #define cpu_has_32fpr          1
 #define cpu_has_counter                1
@@ -34,4 +34,9 @@
 #define cpu_has_nofpuex                0
 #define cpu_has_64bits         1
 
+#define cpu_has_mips32r1       0
+#define cpu_has_mips32r2       0
+#define cpu_has_mips64r1       0
+#define cpu_has_mips64r2       0
+
 #endif /* __ASM_MACH_IP22_CPU_FEATURE_OVERRIDES_H */