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

 memhotplug-dave/mm/Kconfig |   14 --------------
 1 files changed, 14 deletions(-)

diff -puN mm/Kconfig~fudge-patch-1 mm/Kconfig
--- memhotplug/mm/Kconfig~fudge-patch-1	2005-03-28 16:38:40.000000000 -0800
+++ memhotplug-dave/mm/Kconfig	2005-03-28 16:38:40.000000000 -0800
@@ -1,14 +0,0 @@
-config MEMORY_MIGRATE
-	select SWAP
-	bool "Memory migration"
-	default y if MEMORY_HOTPLUG
-
-config MEMORY_REMOVE
-	bool "Allow for memory hot-remove"
-	depends on MEMORY_HOTPLUG && MEMORY_MIGRATE && (X86 && !X86_64)
-	help
-	  Enabling this option allows you to hot-remove highmem zones
-	  on i386 systems.  The i386 depenence is a hack for now.
-
-comment "Selecting Memory Migration automatically enables CONFIG_SWAP"
- 	depends on !SWAP
_