summaryrefslogtreecommitdiffstats
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-02-12 12:19:16 -0800
committerChristoph Lameter <clameter@sgi.com>2008-02-12 12:19:16 -0800
commit9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (patch)
tree17852dd654c37bf86cf3d98c692eef4c6fa73a2c /arch/ia64/Kconfig
parent7cc718d56c8297bd3a3c106ca09e8abf9814bb27 (diff)
parent96b5a46e2a72dc1829370c87053e0cd558d58bc0 (diff)
downloadkernel-crypto-9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9.tar.gz
kernel-crypto-9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9.tar.xz
kernel-crypto-9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r--arch/ia64/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 2d4fcd01bc9..dff9edfc746 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