diff --git a/[refs] b/[refs]
index b062b66d13a1..926dde2a9e3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5e68986e8e75546901010fe4e3485f6cd60b4a6
+refs/heads/master: b1c6cd429b5f9fde39f5950ba9f2993286954f6c
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index 747a9c1228f2..46798aa8d3cc 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -556,6 +556,7 @@ config QEMU
 	select SYS_HAS_CPU_MIPS32_R1
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_BIG_ENDIAN
+	select ARCH_SPARSEMEM_ENABLE
 	help
 	  Qemu is a software emulator which among other architectures also
 	  can simulate a MIPS32 4Kc system.  This patch adds support for the
@@ -1688,6 +1689,9 @@ config ARCH_DISCONTIGMEM_ENABLE
 	  or have huge holes in the physical address space for other reasons.
 	  See <file:Documentation/vm/numa> for more.
 
+config ARCH_SPARSEMEM_ENABLE
+	bool
+
 config NUMA
 	bool "NUMA Support"
 	depends on SYS_SUPPORTS_NUMA