diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-11 09:43:11 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-11 09:43:11 -0700 |
commit | e7578c08a4dee36fe01fb38805f325689e642eb0 (patch) | |
tree | 7426054f6226aa2349ee0c0a3970aeef9276ea59 /arch/sparc64/Kconfig | |
parent | 763b3917e779c9c25d56fc71a796774185cd6ce2 (diff) | |
parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/sparc64/Kconfig')
-rw-r--r-- | arch/sparc64/Kconfig | 2 |
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 |