diff --git a/[refs] b/[refs]
index 665929534f56..933ca4fc9f65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a93ebef698b08ed04af0d7d913bab8aedfdc253
+refs/heads/master: 6661672053aee709d93f5dbd7887c789364c11d4
diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig
index f2f1ca19ed53..011b110365c8 100644
--- a/trunk/mm/Kconfig
+++ b/trunk/mm/Kconfig
@@ -131,6 +131,9 @@ config SPARSEMEM_VMEMMAP
 config HAVE_MEMBLOCK
 	boolean
 
+config NO_BOOTMEM
+	boolean
+
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
 	bool "Allow for memory hot-add"