diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:40:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:40:27 -0400 |
| commit | c1b054d03f5b31c33eaa0b267c629b118eaf3790 (patch) | |
| tree | 9333907ca767be24fcb3667877242976c3e3c8dd /include/asm-sparc64/param.h | |
| parent | 559fb51ba7e66fe298b8355fabde1275b7def35f (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-sparc64/param.h')
| -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 |