aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/defconfig
diff options
context:
space:
mode:
authorDave Hansen <haveblue@us.ibm.com>2005-06-23 03:07:45 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 12:45:02 -0400
commit0e19243e9a19ef8e5994852671bd06bb51630811 (patch)
tree6afcb567e6236a57ff20805f4d4d96c2e6655457 /arch/ppc64/defconfig
parent3f22ab276b931b72ea04b184c155b34d0362bfc3 (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/defconfig')
-rw-r--r--arch/ppc64/defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/defconfig b/arch/ppc64/defconfig
index 2f31bf3046f9..b8e2066dde77 100644
--- a/arch/ppc64/defconfig
+++ b/arch/ppc64/defconfig
@@ -89,7 +89,7 @@ CONFIG_BOOTX_TEXT=y
89CONFIG_IOMMU_VMERGE=y 89CONFIG_IOMMU_VMERGE=y
90CONFIG_SMP=y 90CONFIG_SMP=y
91CONFIG_NR_CPUS=32 91CONFIG_NR_CPUS=32
92CONFIG_DISCONTIGMEM=y 92CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
93# CONFIG_NUMA is not set 93# CONFIG_NUMA is not set
94# CONFIG_SCHED_SMT is not set 94# CONFIG_SCHED_SMT is not set
95# CONFIG_PREEMPT is not set 95# CONFIG_PREEMPT is not set