---

yaml --- r: 13861 b: refs/heads/master c: 45fb6ce h: refs/heads/master i: 13859: b144f59 v: v3
git-mirror · Nov 11, 2005 · 16fa68f · 16fa68f
1 parent 77331f5
commit 16fa68f
Show file tree

Hide file tree

Showing 7 changed files with 170 additions and 297 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e66c4def14aa64ee6d1d4ef077d789abc30125d
+refs/heads/master: 45fb6cea09443b2066016f895937f9c2647a1507
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
@@ -581,17 +581,12 @@ config ARCH_FLATMEM_ENABLE
        def_bool y
        depends on PPC64 && !NUMA
 
-config ARCH_DISCONTIGMEM_ENABLE
-	def_bool y
-	depends on SMP && PPC_PSERIES
-
-config ARCH_DISCONTIGMEM_DEFAULT
+config ARCH_SPARSEMEM_ENABLE
 	def_bool y
-	depends on ARCH_DISCONTIGMEM_ENABLE
 
-config ARCH_SPARSEMEM_ENABLE
+config ARCH_SPARSEMEM_DEFAULT
 	def_bool y
-	depends on ARCH_DISCONTIGMEM_ENABLE
+	depends on SMP && PPC_PSERIES
 
 source "mm/Kconfig"