diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 14:27:27 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 14:27:27 +0100 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /arch/ia64/defconfig | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
| download | kernel_samsung_tuna-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.zip kernel_samsung_tuna-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.tar.gz kernel_samsung_tuna-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.tar.bz2 | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/ia64/defconfig')
| -rw-r--r-- | arch/ia64/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 7be8096..8444add 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig @@ -84,7 +84,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=y CONFIG_IOSAPIC=y CONFIG_FORCE_MAX_ZONEORDER=18 |