summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-09 09:29:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-09 09:29:09 -0700
commitbb6b82381063f54613842decdf948cbfa631842e (patch)
treef2d7c9fd51d838006c49b0a0f36ed5f87d91536e /arch/sparc64/Kconfig
parent79af02c2538d54ff0dcd3f43646f506207f2ee62 (diff)
parenta6524813e032fb33bd1de807a98f8453414335e4 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/Kconfig')
-rw-r--r--arch/sparc64/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index d78bc13ebbb..4b132928624 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -43,6 +43,8 @@ config SPARC64_PAGE_SIZE_4MB
endchoice
+source kernel/Kconfig.hz
+
source "init/Kconfig"
config SYSVIPC_COMPAT