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

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

diff -puN /dev/null mm/Kconfig
--- /dev/null	2004-11-08 15:18:04.000000000 -0800
+++ memhotplug-dave/mm/Kconfig	2004-12-10 13:52:38.000000000 -0800
@@ -0,0 +1,7 @@
+config NONLINEAR
+	bool "Allow nonlinear physical memory"
+
+config CONTIGUOUS_MEM_MAP
+	bool
+	depends on !DISCONTIGMEM && !NONLINEAR
+	default y
_
