diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-12 05:44:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-12 05:44:58 +0100 |
| commit | 1a510089849ff9f70b654659bf976a6baf3a4833 (patch) | |
| tree | 3de6bfaccff49c13f644621ca139e8cfb3023af8 /arch | |
| parent | Be more robust about bad arguments in get_user_pages() (diff) | |
| parent | [IA64] Fix build for sim_defconfig (diff) | |
| download | linux-1a510089849ff9f70b654659bf976a6baf3a4833.tar.xz linux-1a510089849ff9f70b654659bf976a6baf3a4833.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix build for sim_defconfig
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 2d4fcd01bc91..dff9edfc7465 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -232,7 +232,14 @@ config PGTABLE_4 endchoice +if IA64_HP_SIM +config HZ + default 32 +endif + +if !IA64_HP_SIM source kernel/Kconfig.hz +endif config IA64_BRL_EMU bool |