Fixup a few lose ends in explicit support for MIPS R1/R2.

[deliverable/linux.git] / include / asm-mips / mach-mips / cpu-feature-overrides.h

diff --git a/include/asm-mips/mach-mips/cpu-feature-overrides.h b/include/asm-mips/mach-mips/cpu-feature-overrides.h
index 5c5edbf9370710173f8291c1923c6bbf40516b67..9f92aed177545f51582f338d4ce8351fa5327f74 100644 (file)
--- a/include/asm-mips/mach-mips/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-mips/cpu-feature-overrides.h
@@ -14,7 +14,7 @@
 /*
  * CPU feature overrides for MIPS boards
  */
-#ifdef CONFIG_CPU_MIPS32_R1
+#ifdef CONFIG_CPU_MIPS32
 #define cpu_has_tlb            1
 #define cpu_has_4kex           1
 #define cpu_has_4kcache                1
@@ -40,7 +40,7 @@
 #define cpu_icache_snoops_remote_store 1
 #endif
 
-#ifdef CONFIG_CPU_MIPS64_R1
+#ifdef CONFIG_CPU_MIPS64
 #define cpu_has_tlb            1
 #define cpu_has_4kex           1
 #define cpu_has_4kcache                1