diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:22:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:22:27 -0800 |
| commit | 9b80b11c3faa460cf42904a1e368bf2cd075aff6 (patch) | |
| tree | ecc349bbb90856c97be1b93cc9595ceea82fe2c5 /arch/ppc64/Kconfig | |
| parent | b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c (diff) | |
| parent | 271c3f35bd36613513e2c2cc90dc914a84df116e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/ppc64/Kconfig')
| -rw-r--r-- | arch/ppc64/Kconfig | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index c9d32db9d76..9d10c12e87f 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig @@ -279,17 +279,12 @@ config ARCH_FLATMEM_ENABLE def_bool y depends on !NUMA -config ARCH_DISCONTIGMEM_ENABLE - def_bool y - depends on SMP && PPC_PSERIES - -config ARCH_DISCONTIGMEM_DEFAULT +config ARCH_SPARSEMEM_ENABLE def_bool y - depends on ARCH_DISCONTIGMEM_ENABLE -config ARCH_SPARSEMEM_ENABLE +config ARCH_SPARSEMEM_DEFAULT def_bool y - depends on ARCH_DISCONTIGMEM_ENABLE + depends on NUMA source "mm/Kconfig" |