diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /arch/s390/include/asm/param.h | |
| parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
| parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
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 @@ | |||
| 1 | /* | ||
| 2 | * include/asm-s390/param.h | ||
| 3 | * | ||
| 4 | * S390 version | ||
| 5 | * | ||
| 6 | * Derived from "include/asm-i386/param.h" | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef _ASMS390_PARAM_H | 1 | #ifndef _ASMS390_PARAM_H |
| 10 | #define _ASMS390_PARAM_H | 2 | #define _ASMS390_PARAM_H |
| 11 | 3 | ||
| 12 | #ifdef __KERNEL__ | 4 | #include <asm-generic/param.h> |
| 13 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | ||
| 14 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | ||
| 15 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | ||
| 16 | #endif | ||
| 17 | |||
| 18 | #ifndef HZ | ||
| 19 | #define HZ 100 | ||
| 20 | #endif | ||
| 21 | |||
| 22 | #define EXEC_PAGESIZE 4096 | ||
| 23 | |||
| 24 | #ifndef NOGROUP | ||
| 25 | #define NOGROUP (-1) | ||
| 26 | #endif | ||
| 27 | |||
| 28 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
| 29 | 5 | ||
| 30 | #endif | 6 | #endif /* _ASMS390_PARAM_H */ |