From 6557b95d3d6e20ea8297bac7981437bfdc8f96ae Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Tue, 25 May 2010 16:50:04 +0200
Subject: [PATCH] --- yaml --- r: 199487 b: refs/heads/master c:
 392ed655262446a7d9bc678394600a1d81614313 h: refs/heads/master i:   199485:
 3a69244dee9321a7d1d422f67f2bc820a56f40b6   199483:
 5f7b5e8571319e99304c069d9645da548b2152d4   199479:
 2942a4253f5b79c132424a7d95a9cb61ad41c6d0   199471:
 5e4ab017d7845c6594c129fa857a0885a3e78092   199455:
 8eceaf53c4290af1f3794869cb76a7d76dd6f558   199423:
 d047568ec37c476edd230f68be8deef0257e6dc3 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/cris/include/asm/param.h | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

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 */