diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/param.h | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/param.h')
| -rw-r--r-- | include/asm-powerpc/param.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-powerpc/param.h b/include/asm-powerpc/param.h index bdc724f70884..094f63d4d5ca 100644 --- a/include/asm-powerpc/param.h +++ b/include/asm-powerpc/param.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_PARAM_H | 1 | #ifndef _ASM_POWERPC_PARAM_H |
| 2 | #define _ASM_POWERPC_PARAM_H | 2 | #define _ASM_POWERPC_PARAM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | |||
| 6 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 7 | #define HZ CONFIG_HZ /* internal kernel timer frequency */ | 5 | #define HZ CONFIG_HZ /* internal kernel timer frequency */ |
| 8 | #define USER_HZ 100 /* for user interfaces in "ticks" */ | 6 | #define USER_HZ 100 /* for user interfaces in "ticks" */ |