
Sprarsemem unconditionally enables CONFIG_MEMORY_PRESENT, despite any
other architecture options.  So, change the i386 one to prepare for
this.

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

 memhotplug-dave/arch/i386/Kconfig |    2 +-
 memhotplug-dave/mm/Kconfig        |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff -puN mm/Kconfig~B-sparse-149-ARCH_MEMORY_PRESENT mm/Kconfig
--- memhotplug/mm/Kconfig~B-sparse-149-ARCH_MEMORY_PRESENT	2005-04-13 14:20:06.000000000 -0700
+++ memhotplug-dave/mm/Kconfig	2005-04-13 14:20:06.000000000 -0700
@@ -53,3 +53,7 @@ config FLATMEM
 config NEED_MULTIPLE_NODES
 	def_bool y
 	depends on DISCONTIGMEM || NUMA
+
+config HAVE_MEMORY_PRESENT
+	def_bool y
+	depends on ARCH_HAVE_MEMORY_PRESENT
diff -puN arch/i386/Kconfig~B-sparse-149-ARCH_MEMORY_PRESENT arch/i386/Kconfig
--- memhotplug/arch/i386/Kconfig~B-sparse-149-ARCH_MEMORY_PRESENT	2005-04-13 14:20:06.000000000 -0700
+++ memhotplug-dave/arch/i386/Kconfig	2005-04-13 14:20:06.000000000 -0700
@@ -777,7 +777,7 @@ config HAVE_ARCH_BOOTMEM_NODE
 	depends on NUMA
 	default y
 
-config HAVE_MEMORY_PRESENT
+config ARCH_HAVE_MEMORY_PRESENT
 	bool
 	depends on DISCONTIGMEM
 	default y
_
