From 2c178ca7868e106f16adb9f38f7a5d19c46591f1 Mon Sep 17 00:00:00 2001
From: Wu Zhangjin <wuzhangjin@gmail.com>
Date: Tue, 1 Dec 2009 14:55:42 +0800
Subject: [PATCH] --- yaml --- r: 169038 b: refs/heads/master c:
 f133f22dd6f413bdf71ebf7e00ce441d98ac7c87 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/arch/mips/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 82ba3574f354..ccec47029022 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 315fe625f878749a7d2b6b65a40c29bbbe6e1dc7
+refs/heads/master: f133f22dd6f413bdf71ebf7e00ce441d98ac7c87
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index e232e50e6a0a..fd7620f025fa 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -1778,7 +1778,7 @@ config SYS_SUPPORTS_SMARTMIPS
 
 config ARCH_FLATMEM_ENABLE
 	def_bool y
-	depends on !NUMA
+	depends on !NUMA && !CPU_LOONGSON2
 
 config ARCH_DISCONTIGMEM_ENABLE
 	bool