From: Andy Whitcroft Date: Tue, 29 Nov 2005 19:20:55 +0000 (+0000) Subject: [PATCH] powerpc32: clean up available memory models X-Git-Tag: v2.6.16-rc1~666^2~89 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9100b205fdc70b300894954ebebbf2709c5ed525;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 0e4617104f8..2c1186ada3a 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -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