Clean up cpu-feature-overrides, which only repeat the default.

Signed-off-by: Thomas Bogendoerfer <tsbog...@alpha.franken.de>
---
 arch/mips/include/asm/mach-dec/cpu-feature-overrides.h      | 1 -
 arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h     | 3 ---
 arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h     | 3 ---
 arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h | 1 -
 4 files changed, 8 deletions(-)

diff --git a/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h 
b/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h
index 00beb69bfab9..1896e88f6000 100644
--- a/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h
@@ -43,7 +43,6 @@
 #define cpu_has_dsp2                   0
 #define cpu_has_mipsmt                 0
 #define cpu_has_userlocal              0
-#define cpu_hwrena_impl_bits           0
 #define cpu_has_perf_cntr_intr_bit     0
 #define cpu_has_vz                     0
 #define cpu_has_fre                    0
diff --git a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h 
b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
index 136d6d464e32..58f829c9b6c7 100644
--- a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
@@ -25,8 +25,6 @@
 #define cpu_has_4kex                   1
 #define cpu_has_3k_cache               0
 #define cpu_has_4k_cache               1
-#define cpu_has_6k_cache               0
-#define cpu_has_8k_cache               0
 #define cpu_has_tx39_cache             0
 #define cpu_has_fpu                    1
 #define cpu_has_nofpuex                        0
@@ -67,7 +65,6 @@
 #define cpu_has_mipsmt                 0
 #define cpu_has_userlocal              0
 #define cpu_has_inclusive_pcaches      1
-#define cpu_hwrena_impl_bits           0
 #define cpu_has_perf_cntr_intr_bit     0
 #define cpu_has_vz                     0
 #define cpu_has_fre                    0
diff --git a/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h 
b/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h
index cfa02f3d25df..49a93e82c252 100644
--- a/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h
@@ -28,8 +28,6 @@
 #define cpu_has_4kex                   1
 #define cpu_has_3k_cache               0
 #define cpu_has_4k_cache               1
-#define cpu_has_6k_cache               0
-#define cpu_has_8k_cache               0
 #define cpu_has_tx39_cache             0
 #define cpu_has_fpu                    1
 #define cpu_has_nofpuex                        0
@@ -69,7 +67,6 @@
 #define cpu_has_mipsmt                 0
 #define cpu_has_userlocal              0
 #define cpu_has_inclusive_pcaches      1
-#define cpu_hwrena_impl_bits           0
 #define cpu_has_perf_cntr_intr_bit     0
 #define cpu_has_vz                     0
 #define cpu_has_fre                    0
diff --git a/arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h 
b/arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h
index 725e1ed83f6a..23ecf816daa7 100644
--- a/arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h
@@ -29,7 +29,6 @@
 #define cpu_has_octeon_cache   1
 #define cpu_has_4k_cache       0
 #else
-#define cpu_has_octeon_cache   0
 #define cpu_has_4k_cache       1
 #endif
 
-- 
2.16.4

Reply via email to