From 2b3c90f81be10dbf583f55e9a6b78ac9ad8d468b Mon Sep 17 00:00:00 2001 From: David Daney Date: Tue, 5 Jul 2011 16:35:53 -0700 Subject: [PATCH] --- yaml --- r: 264313 b: refs/heads/master c: 2f19d080fb14bdddf11bf54d4db6306235c46c99 h: refs/heads/master i: 264311: 4aa4f195f78b9d459ddf6ce25ec6a5360cd79b0f v: v3 --- [refs] | 2 +- .../mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 826cd848b44e..9faa255f379f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f4ccbc835036cbcc2513585bb2e93ee62e12674 +refs/heads/master: 2f19d080fb14bdddf11bf54d4db6306235c46c99 diff --git a/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h index 0d5a42b5f47a..a58addb98cfd 100644 --- a/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h +++ b/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h @@ -54,7 +54,6 @@ #define cpu_has_mips_r2_exec_hazard 0 #define cpu_has_dsp 0 #define cpu_has_mipsmt 0 -#define cpu_has_userlocal 0 #define cpu_has_vint 0 #define cpu_has_veic 0 #define cpu_hwrena_impl_bits 0xc0000000