===================================================================

---

 memhotplug-dave/mm/Kconfig |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff -puN mm/Kconfig~M0-config-MEMORY_HOTPLUG mm/Kconfig
--- memhotplug/mm/Kconfig~M0-config-MEMORY_HOTPLUG	2005-01-04 13:49:53.000000000 -0800
+++ memhotplug-dave/mm/Kconfig	2005-01-04 13:49:53.000000000 -0800
@@ -1,8 +1,3 @@
-config MEMORY_MIGRATE
-	select SWAP
-	bool "Memory migration"
-	default y if MEMORY_HOTPLUG
-
 config NONLINEAR
 	bool "Allow nonlinear physical memory"
 
@@ -11,5 +6,15 @@ config CONTIGUOUS_MEM_MAP
 	depends on !DISCONTIGMEM && !NONLINEAR
 	default y
 
+config MEMORY_HOTPLUG
+	bool "Allow for memory hotplug"
+	depends on NONLINEAR && HOTPLUG
+	select MEMORY_MIGRATE
+
+config MEMORY_MIGRATE
+	select SWAP
+	bool "Memory migration"
+	default y if MEMORY_HOTPLUG
+
 comment "Selecting Memory Migration automatically enables CONFIG_SWAP"
- 	depends on !SWAP
+	depends on !SWAP
_