From c0588d66b9aea69b42e9b836961c1f7cb731c233 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 1 Oct 2008 21:39:58 +0100
Subject: [PATCH] --- yaml --- r: 112319 b: refs/heads/master c:
 07a2f737ba1d73ace591dd03c512bb0dd63f6785 h: refs/heads/master i:   112317:
 42b33c922905f94e634b3438f24c309b2aed92c0   112315:
 cb32a593024edfc8649022d47519df4f5f0c9db8   112311:
 ba0ac1054f8cfb2ee59c8c1322c76e424fb272b6   112303:
 02e473fd28c5dcf20060c56663f9f9832b336d2e   112287:
 45da38137bbb88e19be2347efe122036a016940b   112255:
 1ae6b84f1fc81b304853bcc052dddd42e87f4486 v: v3

---
 [refs]                 | 2 +-
 trunk/arch/arm/Kconfig | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c236a87aa63d..3888984da31f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee93916efe22f767628f9d25abb8ad8548797336
+refs/heads/master: 07a2f737ba1d73ace591dd03c512bb0dd63f6785
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index b21c93a5f926..ef218ea3010f 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -839,6 +839,7 @@ config OABI_COMPAT
 	  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_DISCONTIGMEM_ENABLE
 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