Merge git://git.infradead.org/hdrcleanup-2.6

[linux-2.6-omap-h63xx.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 7efbff50fcdde4ac24eb38c02882e0c0e4a33f43..e960679f54ba8fc2e08db47f24cf0b5c023b909f 100644 (file)
--- a/include/asm-mips/mach-mips/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-mips/cpu-feature-overrides.h
@@ -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         ? */
 /* #define cpu_has_32fpr       ? */
 #define cpu_has_counter                1
@@ -46,7 +46,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