1 files changed, 5 insertions, 8 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c71ddc0c191a..967ecf92d6a7 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -538,6 +538,11 @@ config IRQ_ALL_CPUS
 
 source "arch/powerpc/platforms/pseries/Kconfig"
 
+config NUMA
+        bool "NUMA support"
+        depends on PPC64
+        default y if SMP && PPC_PSERIES
+
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y
         depends on PPC64
@@ -554,10 +559,6 @@ config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
 
-config ARCH_FLATMEM_ENABLE
-        def_bool y
-        depends on PPC64
-
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
@@ -581,10 +582,6 @@ config NODES_SPAN_OTHER_NODES
         def_bool y
         depends on NEED_MULTIPLE_NODES
 
-config NUMA
-        bool "NUMA support"
-        default y if DISCONTIGMEM || SPARSEMEM
-
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
         depends on PPC64 && SMP