diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 19:29:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 19:29:47 -0500 |
| commit | 401221501af4b87b502eca36ece97b4191380082 (patch) | |
| tree | d67687b4ceb8c78213296039cafe8602514e4cd3 /arch/ia64/defconfig | |
| parent | 63f45b80947cb0819673860f6970f483e2cab21d (diff) | |
| parent | ff51224cab12845c8bd539ca1f2dc18cc851b445 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/defconfig')
| -rw-r--r-- | arch/ia64/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 6e3f147e03e5..275a26c6e5aa 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig | |||
| @@ -82,6 +82,8 @@ CONFIG_MCKINLEY=y | |||
| 82 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 82 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
| 83 | CONFIG_IA64_PAGE_SIZE_16KB=y | 83 | CONFIG_IA64_PAGE_SIZE_16KB=y |
| 84 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | 84 | # CONFIG_IA64_PAGE_SIZE_64KB is not set |
| 85 | CONFIG_PGTABLE_3=y | ||
| 86 | # CONFIG_PGTABLE_4 is not set | ||
| 85 | # CONFIG_HZ_100 is not set | 87 | # CONFIG_HZ_100 is not set |
| 86 | CONFIG_HZ_250=y | 88 | CONFIG_HZ_250=y |
| 87 | # CONFIG_HZ_1000 is not set | 89 | # CONFIG_HZ_1000 is not set |