summaryrefslogtreecommitdiffstats
path: root/arch/ia64/configs/sn2_defconfig
diff options
context:
space:
mode:
authorDave Hansen2005-06-23 09:07:45 +0200
committerLinus Torvalds2005-06-23 18:45:02 +0200
commit0e19243e9a19ef8e5994852671bd06bb51630811 (patch)
tree6afcb567e6236a57ff20805f4d4d96c2e6655457 /arch/ia64/configs/sn2_defconfig
parent[PATCH] make each arch use mm/Kconfig (diff)
downloadkernel-qcow2-linux-0e19243e9a19ef8e5994852671bd06bb51630811.tar.gz
kernel-qcow2-linux-0e19243e9a19ef8e5994852671bd06bb51630811.tar.xz
kernel-qcow2-linux-0e19243e9a19ef8e5994852671bd06bb51630811.zip
[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/ia64/configs/sn2_defconfig')
-rw-r--r--arch/ia64/configs/sn2_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index a01bb02d074d..487d2e36b0a6 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -78,7 +78,7 @@ CONFIG_IA64_L1_CACHE_SHIFT=7
CONFIG_NUMA=y
CONFIG_VIRTUAL_MEM_MAP=y
CONFIG_HOLES_IN_ZONE=y
-CONFIG_DISCONTIGMEM=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
# CONFIG_IA64_CYCLONE is not set
CONFIG_IOSAPIC=y
CONFIG_IA64_SGI_SN_SIM=y