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

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

diff -puN mm/Kconfig~L5-mm-Kconfig-memhp-needs-sparse mm/Kconfig
--- memhotplug/mm/Kconfig~L5-mm-Kconfig-memhp-needs-sparse	2005-04-13 14:21:14.000000000 -0700
+++ memhotplug-dave/mm/Kconfig	2005-04-13 14:21:14.000000000 -0700
@@ -40,7 +40,7 @@ config DISCONTIGMEM_MANUAL
 	  can have degraded performance from extra overhead that
 	  this option imposes.
 
-	  Many NUMA configurations will have this as the only option.
+	  Many NUMA configurations will have this as the only option. && !MEMORY_HOTPLUG
 
 	  If unsure, choose "Flat Memory" over this option.
 
_
