diff options
| author | Linus Torvalds | 2010-06-01 17:51:25 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-06-01 17:51:25 +0200 |
| commit | b904d7131d116900524bd36ec170dcd97846bfd3 (patch) | |
| tree | acd97b3f0027a8dd8659181a316677ee9f578bcc /arch/cris/include/asm | |
| parent | intel_scu_ipc: Length fix (diff) | |
| parent | CRIS: Don't use mask_irq as symbol name (diff) | |
| download | kernel-qcow2-linux-b904d7131d116900524bd36ec170dcd97846bfd3.tar.gz kernel-qcow2-linux-b904d7131d116900524bd36ec170dcd97846bfd3.tar.xz kernel-qcow2-linux-b904d7131d116900524bd36ec170dcd97846bfd3.zip | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
CRIS: Don't use mask_irq as symbol name
CRIS: Simplify param.h by simply including <asm-generic/param.h>
CRISv10: Whitespace fixes for hw_settings.S
CRISv10: Trivial fixes.
CRISv32: Fix RS485 port 4 CD Kconfig item.
CRISv32: Remove duplicated Kconfig items.
cris: push down BKL into some device drivers
Diffstat (limited to 'arch/cris/include/asm')
| -rw-r--r-- | arch/cris/include/asm/param.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/cris/include/asm/param.h b/arch/cris/include/asm/param.h index 0e47994e40be..484fcf8667c0 100644 --- a/arch/cris/include/asm/param.h +++ b/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 */ |