diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
| commit | 418fbfe979d96efc7b91f29b2085d51541c61f0b (patch) | |
| tree | a9acb07328e0c76011727d5b3b6f5407afcd2866 /arch/ia64/configs/sn2_defconfig | |
| parent | 8b132f4ee7304fec4fa27dec67879bc0172e916a (diff) | |
| parent | ff60dde9e46b87757d5e83bd58be0688fca8e816 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/ia64/configs/sn2_defconfig')
| -rw-r--r-- | arch/ia64/configs/sn2_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index e1924cc9687b..ff8bb3770c9d 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig | |||
| @@ -113,7 +113,7 @@ CONFIG_IOSAPIC=y | |||
| 113 | CONFIG_IA64_SGI_SN_XP=m | 113 | CONFIG_IA64_SGI_SN_XP=m |
| 114 | CONFIG_FORCE_MAX_ZONEORDER=17 | 114 | CONFIG_FORCE_MAX_ZONEORDER=17 |
| 115 | CONFIG_SMP=y | 115 | CONFIG_SMP=y |
| 116 | CONFIG_NR_CPUS=512 | 116 | CONFIG_NR_CPUS=1024 |
| 117 | # CONFIG_HOTPLUG_CPU is not set | 117 | # CONFIG_HOTPLUG_CPU is not set |
| 118 | CONFIG_SCHED_SMT=y | 118 | CONFIG_SCHED_SMT=y |
| 119 | CONFIG_PREEMPT=y | 119 | CONFIG_PREEMPT=y |