aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2015-04-20 11:32:26 +1000
committerDave Airlie <[email protected]>2015-04-20 13:05:20 +1000
commit2c33ce009ca2389dbf0535d0672214d09738e35e (patch)
tree6186a6458c3c160385d794a23eaf07c786a9e61b /arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
parentcec32a47010647e8b0603726ebb75b990a4057a4 (diff)
parent09d51602cf84a1264946711dd4ea0dddbac599a1 (diff)
Merge Linus master into drm-next
The merge is clean, but the arm build fails afterwards, due to API changes in the regulator tree. I've included the patch into the merge to fix the build. Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'arch/mips/include/asm/mach-rm/cpu-feature-overrides.h')
-rw-r--r--arch/mips/include/asm/mach-rm/cpu-feature-overrides.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
index f095c529c48c..98cf40417c5d 100644
--- a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
@@ -15,7 +15,6 @@
#define cpu_has_tlb 1
#define cpu_has_4kex 1
#define cpu_has_4k_cache 1
-#define cpu_has_fpu 1
#define cpu_has_32fpr 1
#define cpu_has_counter 1
#define cpu_has_watch 0