commit ec917c2c1ab4359a1d438e62daeb50cc42e632e1
author Ralf Baechle <ralf@linux-mips.org> Fri Oct 07 16:58:15 2005 +0100
committer Ralf Baechle <ralf@linux-mips.org> Sat Oct 29 19:32:37 2005 +0100
tree deb2e00bee354577e1f19b7b70c1a2037828a957
parent f92c1759a40a85f52b835c21b0ef6ce556b340c5

Fixup a few lose ends in explicit support for MIPS R1/R2.
    
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

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 5c5edbf..9f92aed 100644
--- 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