diff --git a/[refs] b/[refs]
index 16d498f419db..fc3683d9359e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b9c88e2a3961346db1a23d967585af16ff33f05
+refs/heads/master: 392ed655262446a7d9bc678394600a1d81614313
diff --git a/trunk/arch/cris/include/asm/param.h b/trunk/arch/cris/include/asm/param.h
index 0e47994e40be..484fcf8667c0 100644
--- a/trunk/arch/cris/include/asm/param.h
+++ b/trunk/arch/cris/include/asm/param.h
@@ -2,22 +2,9 @@
 #define _ASMCRIS_PARAM_H
 
 /* Currently we assume that HZ=100 is good for CRIS. */
-#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	8192
 
-#ifndef NOGROUP
-#define NOGROUP		(-1)
-#endif
-
-#define MAXHOSTNAMELEN	64	/* max length of hostname */
+#include <asm-generic/param.h>
 
-#endif
+#endif /* _ASMCRIS_PARAM_H */