Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/include/asm-mips/mach-cobalt/cpu-feature-overrides.h b/include/asm-mips/mach-cobalt/cpu-feature-overrides.h
index ace8c5ef97015c741b5f2b1c7206ca78466ccc78..c6dfa59d1986d95da18d3b9a88c3c3716f4ffb27 100644 (file)
--- a/include/asm-mips/mach-cobalt/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-cobalt/cpu-feature-overrides.h
@@ -8,7 +8,6 @@
 #ifndef __ASM_COBALT_CPU_FEATURE_OVERRIDES_H
 #define __ASM_COBALT_CPU_FEATURE_OVERRIDES_H
 
-#include <linux/config.h>
 
 #define cpu_has_tlb            1
 #define cpu_has_4kex           1
@@ -28,7 +27,7 @@
 #define cpu_has_mcheck         0
 #define cpu_has_ejtag          0
 
-#define cpu_has_subset_pcaches 0
+#define cpu_has_inclusive_pcaches      0
 #define cpu_dcache_line_size() 32
 #define cpu_icache_line_size() 32
 #define cpu_scache_line_size() 0