diff --git a/[refs] b/[refs]
index 0726a317662d..cde0e16429eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 785dcd44b60ec8ede76fed0af54333ab5f3e848c
+refs/heads/master: 368a0a3afad08069b2679ecaff80fc18c10a6e2a
diff --git a/trunk/arch/ppc64/Kconfig b/trunk/arch/ppc64/Kconfig
index 87344f324233..011b5c0bf1d0 100644
--- a/trunk/arch/ppc64/Kconfig
+++ b/trunk/arch/ppc64/Kconfig
@@ -199,9 +199,16 @@ config HMT
 	  pSeries systems p620 and p660 have such a cpu type.
 
 config ARCH_DISCONTIGMEM_ENABLE
-	bool "Discontiguous Memory Support"
+	def_bool y
 	depends on SMP && PPC_PSERIES
 
+config ARCH_DISCONTIGMEM_DEFAULT
+	def_bool y
+	depends on ARCH_DISCONTIGMEM_ENABLE
+
+config ARCH_FLATMEM_ENABLE
+	def_bool y
+
 source "mm/Kconfig"
 
 config NUMA