]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] powerpc32: clean up available memory models
authorAndy Whitcroft <apw@shadowen.org>
Tue, 29 Nov 2005 19:20:55 +0000 (19:20 +0000)
committerPaul Mackerras <paulus@samba.org>
Mon, 9 Jan 2006 03:51:40 +0000 (14:51 +1100)
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>
arch/powerpc/Kconfig

index 0e4617104f8caa29710f01fd9a0e5b1e2785e969..2c1186ada3ab4a9ccf974a0879b6d0b33f6e32b8 100644 (file)
@@ -586,11 +586,12 @@ config ARCH_SELECT_MEMORY_MODEL
        depends on PPC64
 
 config ARCH_FLATMEM_ENABLE
-       def_bool y
-       depends on PPC64 && !NUMA
+       def_bool y
+       depends on (PPC64 && !NUMA) || PPC32
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
+       depends on PPC64
 
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y