From 76ab2792716cb24d41056e6053e6aa308336c9b2 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Mon, 31 Oct 2011 17:08:20 -0700
Subject: [PATCH] --- yaml --- r: 272137 b: refs/heads/master c:
 6661672053aee709d93f5dbd7887c789364c11d4 h: refs/heads/master i:   272135:
 b1ac3aecc151f983b0cfb2952955638eb3eea867 v: v3

---
 [refs]           | 2 +-
 trunk/mm/Kconfig | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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"