commit 07a2f737ba1d73ace591dd03c512bb0dd63f6785
author Russell King <rmk@dyn-67.arm.linux.org.uk> Wed Oct 01 21:39:58 2008 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Oct 01 21:41:32 2008 +0100
tree 76ef1e09ee3016263c910337fd400028a7a5150b
parent ee93916efe22f767628f9d25abb8ad8548797336

[ARM] mm: deprecate discontigmem on ARM

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b21c93a..ef218ea 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -839,6 +839,7 @@
 	  UNPREDICTABLE (in fact it can be predicted that it won't work
 	  at all). If in doubt say Y.
 
+# Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE
 	bool
 	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
@@ -851,8 +852,11 @@
 config ARCH_SPARSEMEM_ENABLE
 	bool
 
+config ARCH_SPARSEMEM_DEFAULT
+	def_bool ARCH_SPARSEMEM_ENABLE
+
 config ARCH_SELECT_MEMORY_MODEL
-	bool
+	def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE
 
 config NODES_SHIFT
 	int