---

yaml --- r: 112319 b: refs/heads/master c: 07a2f73 h: refs/heads/master i: 112317: 42b33c9 112315: cb32a59 112311: ba0ac10 112303: 02e473f 112287: 45da381 112255: 1ae6b84 v: v3
git-mirror · Oct 1, 2008 · c0588d6 · c0588d6
1 parent a18c292
commit c0588d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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