
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 memhotplug-dave/arch/x86_64/Kconfig |    9 ---------
 1 files changed, 9 deletions(-)

diff -puN arch/x86_64/Kconfig~H4-memory_hotplug_Kconfig_options_and_define-remove-generic arch/x86_64/Kconfig
--- memhotplug/arch/x86_64/Kconfig~H4-memory_hotplug_Kconfig_options_and_define-remove-generic	2004-12-10 13:52:48.000000000 -0800
+++ memhotplug-dave/arch/x86_64/Kconfig	2004-12-10 13:52:48.000000000 -0800
@@ -306,15 +306,6 @@ config ARCH_HAS_BOOTPA
        bool
        default y
 
-config MEMORY_HOTPLUG
-	bool "Allow for memory hotplug"
-	depends on NONLINEAR && HOTPLUG && !NUMA
-	select MEMORY_MIGRATE
-
-config MEMORY_MIGRATE
-	bool "Memory migration"
-	default y if MEMORY_HOTPLUG
-
 config HAVE_DEC_LOCK
 	bool
 	depends on SMP
_
