diff --git a/[refs] b/[refs]
index 3b7731772f81..bc5bff7639e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 342a0497c23c278633f8674ab62f71e5049b7080
+refs/heads/master: 9cf8f370f0777a24808b3485f3b5abb8e736d3e8
diff --git a/trunk/include/asm-parisc/param.h b/trunk/include/asm-parisc/param.h
index 07cb9b93cfe2..32e03d877858 100644
--- a/trunk/include/asm-parisc/param.h
+++ b/trunk/include/asm-parisc/param.h
@@ -2,13 +2,9 @@
 #define _ASMPARISC_PARAM_H
 
 #ifdef __KERNEL__
-# ifdef CONFIG_PA20
-#  define HZ		1000		/* Faster machines */
-# else
-#  define HZ		100		/* Internal kernel timer frequency */
-# endif
-# define USER_HZ	100		/* .. some user interfaces are in "ticks" */
-# define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */
+#define HZ		CONFIG_HZ
+#define USER_HZ		100		/* some user API use "ticks" */
+#define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */
 #endif
 
 #ifndef HZ