From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>

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

 memhotplug-dave/arch/ia64/Kconfig |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff -puN arch/ia64/Kconfig~B-sparse-181-sparsemem-ia64-fixup-Kconfig arch/ia64/Kconfig
--- memhotplug/arch/ia64/Kconfig~B-sparse-181-sparsemem-ia64-fixup-Kconfig	2005-04-13 14:20:30.000000000 -0700
+++ memhotplug-dave/arch/ia64/Kconfig	2005-04-13 14:20:30.000000000 -0700
@@ -283,13 +283,17 @@ config PHYSICAL_MEMORY_BITS
 	help
 	  Maximum physical memory address bits.
 
-config ARCH_SPARSEMEM_DEFAULT
-	bool
+config ARCH_SPARSEMEM_ENABLE
+	def_bool y
 	depends on NUMA
 
-config ARCH_DISCONTIGMEM_DISABLE
-	bool
-	depends !NUMA
+config ARCH_DISCONTIGMEM_DEFAULT
+	def_bool y
+	depends on NUMA
+
+config ARCH_DISCONTIGMEM_ENABLE
+	def_bool y
+	depends NUMA
 
 config HAVE_DEC_LOCK
 	bool
_