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

---

 memhotplug-dave/init/Kconfig |    3 +++
 memhotplug-dave/mm/Kconfig   |    3 +++
 2 files changed, 6 insertions(+)

diff -puN init/Kconfig~page_migration07.2-memory_migration-depends-swap init/Kconfig
--- memhotplug/init/Kconfig~page_migration07.2-memory_migration-depends-swap	2005-01-04 13:49:07.000000000 -0800
+++ memhotplug-dave/init/Kconfig	2005-01-04 13:49:07.000000000 -0800
@@ -79,6 +79,9 @@ config SWAP
 	  used to provide more virtual memory than the actual RAM present
 	  in your computer.  If unsure say Y.
 
+comment "  Swap automatically enabled by selecting Memory Migration"
+	depends on MEMORY_MIGRATE
+
 config SYSVIPC
 	bool "System V IPC"
 	depends on MMU
diff -puN mm/Kconfig~page_migration07.2-memory_migration-depends-swap mm/Kconfig
--- memhotplug/mm/Kconfig~page_migration07.2-memory_migration-depends-swap	2005-01-04 13:49:07.000000000 -0800
+++ memhotplug-dave/mm/Kconfig	2005-01-04 13:49:07.000000000 -0800
@@ -1,3 +1,6 @@
 config MEMORY_MIGRATE
 	select SWAP
 	bool "Memory migration"
+
+comment "Selecting Memory Migration automatically enables CONFIG_SWAP"
+ 	depends on !SWAP
_