diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-02-04 02:12:42 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-04 02:13:05 +0400 |
| commit | 972c5ae961d6e5103e2b33d935cfa4145fd47140 (patch) | |
| tree | 350b2a76b979ba8766c09838617df67ff330eca0 /arch/frv/include/asm/param.h | |
| parent | 5196d20305d5e30d871111d3a876cf067dd94255 (diff) | |
| parent | 7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f (diff) | |
| download | linux-972c5ae961d6e5103e2b33d935cfa4145fd47140.tar.xz | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)
Diffstat (limited to 'arch/frv/include/asm/param.h')
| -rw-r--r-- | arch/frv/include/asm/param.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/frv/include/asm/param.h b/arch/frv/include/asm/param.h index 6859dd503ed3..a52dca9a9566 100644 --- a/arch/frv/include/asm/param.h +++ b/arch/frv/include/asm/param.h @@ -1,22 +1,8 @@ #ifndef _ASM_PARAM_H #define _ASM_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 16384 -#ifndef NOGROUP -#define NOGROUP (-1) -#endif - -#define MAXHOSTNAMELEN 64 /* max length of hostname */ +#include <asm-generic/param.h> #endif /* _ASM_PARAM_H */ |