diff -Naurp linux-2.6.15.1.orig/include/asm-mips/mach-ip22/cpu-feature-overrides.h linux-2.6.15.1/include/asm-mips/mach-ip22/cpu-feature-overrides.h
--- linux-2.6.15.1.orig/include/asm-mips/mach-ip22/cpu-feature-overrides.h	2006-01-23 16:49:30.000000000 -0500
+++ linux-2.6.15.1/include/asm-mips/mach-ip22/cpu-feature-overrides.h	2006-01-23 17:16:13.000000000 -0500
@@ -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
diff -Naurp linux-2.6.15.1.orig/include/asm-mips/mach-mips/cpu-feature-overrides.h linux-2.6.15.1/include/asm-mips/mach-mips/cpu-feature-overrides.h
--- linux-2.6.15.1.orig/include/asm-mips/mach-mips/cpu-feature-overrides.h	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15.1/include/asm-mips/mach-mips/cpu-feature-overrides.h	2006-01-23 17:15:57.000000000 -0500
@@ -17,7 +17,7 @@
 #ifdef CONFIG_CPU_MIPS32
 #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		? */
 /* #define cpu_has_32fpr	? */
 #define cpu_has_counter		1
@@ -43,7 +43,7 @@
 #ifdef CONFIG_CPU_MIPS64
 #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		? */
 /* #define cpu_has_32fpr	? */
 #define cpu_has_counter		1
diff -Naurp linux-2.6.15.1.orig/include/asm-mips/mach-rm200/cpu-feature-overrides.h linux-2.6.15.1/include/asm-mips/mach-rm200/cpu-feature-overrides.h
--- linux-2.6.15.1.orig/include/asm-mips/mach-rm200/cpu-feature-overrides.h	2006-01-23 16:49:30.000000000 -0500
+++ linux-2.6.15.1/include/asm-mips/mach-rm200/cpu-feature-overrides.h	2006-01-23 17:16:25.000000000 -0500
@@ -14,7 +14,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
diff -Naurp linux-2.6.15.1.orig/include/asm-mips/mach-sim/cpu-feature-overrides.h linux-2.6.15.1/include/asm-mips/mach-sim/cpu-feature-overrides.h
--- linux-2.6.15.1.orig/include/asm-mips/mach-sim/cpu-feature-overrides.h	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15.1/include/asm-mips/mach-sim/cpu-feature-overrides.h	2006-01-23 17:16:42.000000000 -0500
@@ -16,7 +16,7 @@
 #ifdef CONFIG_CPU_MIPS32
 #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		0
 /* #define cpu_has_32fpr	? */
 #define cpu_has_counter		1
@@ -41,7 +41,7 @@
 #ifdef CONFIG_CPU_MIPS64
 #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		? */
 /* #define cpu_has_32fpr	? */
 #define cpu_has_counter		1