diff --git a/[refs] b/[refs]
index 70a51dfa0413..b3c01cd58ea2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d507462c63c7423ae9b9378ed049909a646d28f7
+refs/heads/master: cb0d93505f6e9d2db87a50f402ec022517ec44c8
diff --git a/trunk/arch/frv/include/asm/param.h b/trunk/arch/frv/include/asm/param.h
index 6859dd503ed3..a52dca9a9566 100644
--- a/trunk/arch/frv/include/asm/param.h
+++ b/trunk/arch/frv/include/asm/param.h
@@ -1,22 +1,8 @@
 #ifndef _ASM_PARAM_H
 #define _ASM_PARAM_H
 
-#ifdef __KERNEL__
-#define HZ		CONFIG_HZ	/* Internal kernel timer frequency */
-#define USER_HZ		100		/* .. some user interfaces are in "ticks" */
-#define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */
-#endif
-
-#ifndef HZ
-#define HZ 100
-#endif
-
 #define EXEC_PAGESIZE	16384
 
-#ifndef NOGROUP
-#define NOGROUP		(-1)
-#endif
-
-#define MAXHOSTNAMELEN		64	/* max length of hostname */
+#include <asm-generic/param.h>
 
 #endif /* _ASM_PARAM_H */