Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 8ce2597..c882b8e 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -131,6 +131,12 @@ config SPARSEMEM_VMEMMAP
 config HAVE_MEMBLOCK
        boolean
 
+config HAVE_MEMBLOCK_NODE_MAP
+       boolean
+
+config ARCH_DISCARD_MEMBLOCK
+       boolean
+
 config NO_BOOTMEM
        boolean