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