Reorganize mm/Kconfig to allow for memory hotplug to be available as a valid option on non-NUMA kernels without requiring "simulated" memory hotplug. Move memory hotplug config option and allow it to automagically select SPARSEMEM if enabled. Signed-off-by: Matt Tolentino Signed-off-by: Dave Hansen --- memhotplug-dave/mm/Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN mm/Kconfig~L3-shuffle-mm-kconfig-memhotplug-options mm/Kconfig --- memhotplug/mm/Kconfig~L3-shuffle-mm-kconfig-memhotplug-options 2005-04-13 14:21:12.000000000 -0700 +++ memhotplug-dave/mm/Kconfig 2005-04-13 14:21:12.000000000 -0700 @@ -11,7 +11,7 @@ choice config FLATMEM_MANUAL bool "Flat Memory" - depends on !ARCH_DISCONTIGMEM_ENABLE || ARCH_FLATMEM_ENABLE + depends on !ARCH_DISCONTIGMEM_ENABLE || ARCH_FLATMEM_ENABLE && !MEMORY_HOTPLUG help This option allows you to change some of the ways that Linux manages its memory internally. Most users will _