diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 15:52:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 15:52:48 +0100 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/s390/include/asm/param.h | |
| parent | ASoC: ad1836: reset and restore clock control mode in suspend/resume entry (diff) | |
| parent | ASoC: fix a memory-leak in wm8903 (diff) | |
| download | linux-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.tar.xz linux-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.zip | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/s390/include/asm/param.h')
| -rw-r--r-- | arch/s390/include/asm/param.h | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/arch/s390/include/asm/param.h b/arch/s390/include/asm/param.h index 34aaa4603347..c616821bf2ac 100644 --- a/arch/s390/include/asm/param.h +++ b/arch/s390/include/asm/param.h @@ -1,30 +1,6 @@ -/* - * include/asm-s390/param.h - * - * S390 version - * - * Derived from "include/asm-i386/param.h" - */ - #ifndef _ASMS390_PARAM_H #define _ASMS390_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 4096 - -#ifndef NOGROUP -#define NOGROUP (-1) -#endif - -#define MAXHOSTNAMELEN 64 /* max length of hostname */ +#include <asm-generic/param.h> -#endif +#endif /* _ASMS390_PARAM_H */ |