diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 12:29:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 12:29:09 -0400 |
| commit | bb6b82381063f54613842decdf948cbfa631842e (patch) | |
| tree | f2d7c9fd51d838006c49b0a0f36ed5f87d91536e /include | |
| parent | 79af02c2538d54ff0dcd3f43646f506207f2ee62 (diff) | |
| parent | a6524813e032fb33bd1de807a98f8453414335e4 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/param.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h index 6a12f3ac0359..a1cd4974630b 100644 --- a/include/asm-sparc64/param.h +++ b/include/asm-sparc64/param.h | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | /* $Id: param.h,v 1.2 2000/10/30 21:01:41 davem Exp $ */ | ||
| 2 | #ifndef _ASMSPARC64_PARAM_H | 1 | #ifndef _ASMSPARC64_PARAM_H |
| 3 | #define _ASMSPARC64_PARAM_H | 2 | #define _ASMSPARC64_PARAM_H |
| 4 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | |||
| 5 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
| 6 | # define HZ 1000 /* Internal kernel timer frequency */ | 7 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
| 7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 8 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
| 8 | # define CLOCKS_PER_SEC (USER_HZ) | 9 | # define CLOCKS_PER_SEC (USER_HZ) |
| 9 | #endif | 10 | #endif |