From 5337370699e86f3095d12710e8a0999ad5b04b64 Mon Sep 17 00:00:00 2001
From: Chris Dearman <chris@mips.com>
Date: Fri, 30 Jun 2006 12:32:37 +0100
Subject: [PATCH] --- yaml --- r: 32557 b: refs/heads/master c:
 2e128dedcd66d2f17f42a45dacc223fa2dcd8acd h: refs/heads/master i:   32555:
 2d82db64abae926f1899f27152843956263dae7b v: v3

---
 [refs]                                | 2 +-
 trunk/include/asm-mips/cpu-features.h | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 20be72a39e58..009d2a25a355 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70ae6126090686b2e957f0abd2a3c882e94c7071
+refs/heads/master: 2e128dedcd66d2f17f42a45dacc223fa2dcd8acd
diff --git a/trunk/include/asm-mips/cpu-features.h b/trunk/include/asm-mips/cpu-features.h
index 44285a9d5520..3c2fc2b647c8 100644
--- a/trunk/include/asm-mips/cpu-features.h
+++ b/trunk/include/asm-mips/cpu-features.h
@@ -143,12 +143,8 @@
 #define cpu_has_dsp		(cpu_data[0].ases & MIPS_ASE_DSP)
 #endif
 
-#ifdef CONFIG_MIPS_MT
 #ifndef cpu_has_mipsmt
-# define cpu_has_mipsmt		(cpu_data[0].ases & MIPS_ASE_MIPSMT)
-#endif
-#else
-# define cpu_has_mipsmt		0
+#define cpu_has_mipsmt		(cpu_data[0].ases & MIPS_ASE_MIPSMT)
 #endif
 
 #ifdef CONFIG_32BIT