diff options
author | Dave Hansen <haveblue@us.ibm.com> | 2005-06-23 00:07:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:45:02 -0700 |
commit | 0e19243e9a19ef8e5994852671bd06bb51630811 (patch) | |
tree | 6afcb567e6236a57ff20805f4d4d96c2e6655457 /arch/ppc64/configs | |
parent | 3f22ab276b931b72ea04b184c155b34d0362bfc3 (diff) | |
download | kernel_samsung_aries-0e19243e9a19ef8e5994852671bd06bb51630811.zip kernel_samsung_aries-0e19243e9a19ef8e5994852671bd06bb51630811.tar.gz kernel_samsung_aries-0e19243e9a19ef8e5994852671bd06bb51630811.tar.bz2 |
[PATCH] update all defconfigs for ARCH_DISCONTIGMEM_ENABLE
This will at least suppress one prompt that users would have received the
first time they compile with the new DISCONTIG arch option. They'll still
get the "Memory Model" prompt, but 99% of them will have the default work
there.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc64/configs')
-rw-r--r-- | arch/ppc64/configs/pSeries_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/configs/pSeries_defconfig b/arch/ppc64/configs/pSeries_defconfig index 3eb5ef2..d0db8b5 100644 --- a/arch/ppc64/configs/pSeries_defconfig +++ b/arch/ppc64/configs/pSeries_defconfig @@ -88,7 +88,7 @@ CONFIG_IBMVIO=y CONFIG_IOMMU_VMERGE=y CONFIG_SMP=y CONFIG_NR_CPUS=128 -CONFIG_DISCONTIGMEM=y +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y CONFIG_NUMA=y CONFIG_SCHED_SMT=y # CONFIG_PREEMPT is not set |