diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 18:29:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 18:29:09 +0200 |
| commit | bb6b82381063f54613842decdf948cbfa631842e (patch) | |
| tree | f2d7c9fd51d838006c49b0a0f36ed5f87d91536e /include | |
| parent | [SCTP]: Use struct list_head for chunk lists, not sk_buff_head. (diff) | |
| parent | [SPARC64]: Support CONFIG_HZ (diff) | |
| download | linux-bb6b82381063f54613842decdf948cbfa631842e.tar.xz linux-bb6b82381063f54613842decdf948cbfa631842e.zip | |
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 @@ -/* $Id: param.h,v 1.2 2000/10/30 21:01:41 davem Exp $ */ #ifndef _ASMSPARC64_PARAM_H #define _ASMSPARC64_PARAM_H +#include <linux/config.h> + #ifdef __KERNEL__ -# define HZ 1000 /* Internal kernel timer frequency */ +# define HZ CONFIG_HZ /* Internal kernel timer frequency */ # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ # define CLOCKS_PER_SEC (USER_HZ) #endif |