aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2005-11-29 14:20:55 -0500
committerPaul Mackerras <paulus@samba.org>2006-01-08 22:51:40 -0500
commit9100b205fdc70b300894954ebebbf2709c5ed525 (patch)
treefa205423dcb6c67798f2d4688e242690eda636a9 /arch
parent7b653cafcbf187c6d86ee3551e4d73a610f18d27 (diff)
[PATCH] powerpc32: clean up available memory models
Clean up the currently available memory models for ppc32 under the powerpc architecture. We need FLATMEM for ppc32: enable it. SPARSEMEM is not parameterised for ppc32 so disable that. Take this opportunity to clean up white space for FLATMEM_ENABLE. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 0e4617104f8c..2c1186ada3ab 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -586,11 +586,12 @@ config ARCH_SELECT_MEMORY_MODEL
586 depends on PPC64 586 depends on PPC64
587 587
588config ARCH_FLATMEM_ENABLE 588config ARCH_FLATMEM_ENABLE
589 def_bool y 589 def_bool y
590 depends on PPC64 && !NUMA 590 depends on (PPC64 && !NUMA) || PPC32
591 591
592config ARCH_SPARSEMEM_ENABLE 592config ARCH_SPARSEMEM_ENABLE
593 def_bool y 593 def_bool y
594 depends on PPC64
594 595
595config ARCH_SPARSEMEM_DEFAULT 596config ARCH_SPARSEMEM_DEFAULT
596 def_bool y 597 def_bool y