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

---

 memhotplug-dave/mm/Kconfig |    9 +++++++++
 1 files changed, 9 insertions(+)

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