From 8ef82a1d107f079d1d20db6055cc6199b98593f6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 8 Jul 2005 15:21:51 -0700
Subject: [PATCH] --- yaml --- r: 4411 b: refs/heads/master c:
 a6524813e032fb33bd1de807a98f8453414335e4 h: refs/heads/master i:   4409:
 46728d1a3ed04f33229bcb1fa33e5ab510be2db1   4407:
 edcb27cf1855637cac3a155a40603edcc33ab2df v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sparc64/Kconfig        | 2 ++
 trunk/include/asm-sparc64/param.h | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4178ceae4344..1db3f54c61c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcc83a028552ac34538db52d82446d1da6ea8c22
+refs/heads/master: a6524813e032fb33bd1de807a98f8453414335e4
diff --git a/trunk/arch/sparc64/Kconfig b/trunk/arch/sparc64/Kconfig
index d78bc13ebbb9..4b1329286242 100644
--- a/trunk/arch/sparc64/Kconfig
+++ b/trunk/arch/sparc64/Kconfig
@@ -43,6 +43,8 @@ config SPARC64_PAGE_SIZE_4MB
 
 endchoice
 
+source kernel/Kconfig.hz
+
 source "init/Kconfig"
 
 config SYSVIPC_COMPAT
diff --git a/trunk/include/asm-sparc64/param.h b/trunk/include/asm-sparc64/param.h
index 6a12f3ac0359..a1cd4974630b 100644
--- a/trunk/include/asm-sparc64/param.h
+++ b/trunk/include/asm-sparc64/param.h
@@ -1,9 +1,10 @@
-/* $Id: param.h,v 1.2 2000/10/30 21:01:41 davem Exp $ */
 #ifndef _ASMSPARC64_PARAM_H
 #define _ASMSPARC64_PARAM_H
 
+#include <linux/config.h>
+
 #ifdef __KERNEL__
-# define HZ		1000	/* Internal kernel timer frequency */
+# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */
 # define USER_HZ	100	/* .. some user interfaces are in "ticks" */
 # define CLOCKS_PER_SEC (USER_HZ)
 #endif