diff --git a/[refs] b/[refs]
index f76331018252..a7a0d0ffd239 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2494ace990c5d37cfe66911b85d28e6945eadfc
+refs/heads/master: 1a83e175dc2c7be931a3ea9c7fb0769e6de55e90
diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig
index 57963c6063d1..f791196cee8c 100644
--- a/trunk/mm/Kconfig
+++ b/trunk/mm/Kconfig
@@ -67,7 +67,7 @@ config DISCONTIGMEM
 
 config SPARSEMEM
 	def_bool y
-	depends on SPARSEMEM_MANUAL
+	depends on (!SELECT_MEMORY_MODEL && ARCH_SPARSEMEM_ENABLE) || SPARSEMEM_MANUAL
 
 config FLATMEM
 	def_bool y