summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 20:44:58 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 20:44:58 -0800
commit1a510089849ff9f70b654659bf976a6baf3a4833 (patch)
tree3de6bfaccff49c13f644621ca139e8cfb3023af8 /arch
parent900cf086fd2fbad07f72f4575449e0d0958f860f (diff)
parent10d0aa3c0a03dd04227ab3a4958563d84276d02e (diff)
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/Kconfig7
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