Signed-off-by: Dave Hansen --- memhotplug-dave/arch/x86_64/Kconfig | 9 +-------- 1 files changed, 1 insertion(+), 8 deletions(-) diff -puN arch/x86_64/Kconfig~H2.1-add_basic_nonlinear_support_for_x86-64-mm-Kconfig arch/x86_64/Kconfig --- memhotplug/arch/x86_64/Kconfig~H2.1-add_basic_nonlinear_support_for_x86-64-mm-Kconfig 2004-12-10 13:52:47.000000000 -0800 +++ memhotplug-dave/arch/x86_64/Kconfig 2004-12-10 13:52:47.000000000 -0800 @@ -300,14 +300,7 @@ config NUMA bool default n -config NONLINEAR - bool "Allow for nonlinear physical memory" - default y - -config ARCH_HAS_MEM_MAP - bool - depends on !DISCONTIGMEM && !NONLINEAR - default y +source "mm/Kconfig" config ARCH_HAS_BOOTPA bool _