diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
| commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
| tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /include/asm-mips/param.h | |
| parent | d8ce75324135ea7100124c1fff4ec5090a350607 (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'include/asm-mips/param.h')
| -rw-r--r-- | include/asm-mips/param.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/param.h b/include/asm-mips/param.h index 2bead8273ced..1d9bb8c5ab24 100644 --- a/include/asm-mips/param.h +++ b/include/asm-mips/param.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | 13 | ||
| 14 | # include <param.h> /* Internal kernel timer frequency */ | 14 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
| 15 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 15 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
| 16 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | 16 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ |
| 17 | #endif | 17 | #endif |