---

 memhotplug-dave/mm/Kconfig |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN mm/Kconfig~FROM-MM-A6.1-mm-Kconfig-defaults mm/Kconfig
--- memhotplug/mm/Kconfig~FROM-MM-A6.1-mm-Kconfig-defaults	2005-04-13 14:19:53.000000000 -0700
+++ memhotplug-dave/mm/Kconfig	2005-04-13 14:19:53.000000000 -0700
@@ -1,8 +1,7 @@
 choice
 	prompt "Memory model"
-	default FLATMEM
-	default SPARSEMEM if ARCH_SPARSEMEM_DEFAULT
 	default DISCONTIGMEM if ARCH_DISCONTIGMEM_DEFAULT
+	default FLATMEM
 
 config FLATMEM
 	bool "Flat Memory"
_