diff options
| author | Dave Hansen <haveblue@us.ibm.com> | 2005-06-23 03:07:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:45:02 -0400 |
| commit | 0e19243e9a19ef8e5994852671bd06bb51630811 (patch) | |
| tree | 6afcb567e6236a57ff20805f4d4d96c2e6655457 /arch/ppc64/configs | |
| parent | 3f22ab276b931b72ea04b184c155b34d0362bfc3 (diff) | |
[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 3eb5ef25d3a3..d0db8b5966c0 100644 --- a/arch/ppc64/configs/pSeries_defconfig +++ b/arch/ppc64/configs/pSeries_defconfig | |||
| @@ -88,7 +88,7 @@ CONFIG_IBMVIO=y | |||
| 88 | CONFIG_IOMMU_VMERGE=y | 88 | CONFIG_IOMMU_VMERGE=y |
| 89 | CONFIG_SMP=y | 89 | CONFIG_SMP=y |
| 90 | CONFIG_NR_CPUS=128 | 90 | CONFIG_NR_CPUS=128 |
| 91 | CONFIG_DISCONTIGMEM=y | 91 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
| 92 | CONFIG_NUMA=y | 92 | CONFIG_NUMA=y |
| 93 | CONFIG_SCHED_SMT=y | 93 | CONFIG_SCHED_SMT=y |
| 94 | # CONFIG_PREEMPT is not set | 94 | # CONFIG_PREEMPT is not set |