diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:58:53 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:58:53 -0500 |
commit | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (patch) | |
tree | 5ce615d345e720ddabf95c46fb62287ee763ad4e /include/asm-x86_64/param.h | |
parent | aaadff81195056c7c14e0d834b3318c624c0fd78 (diff) | |
parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
download | op-kernel-dev-a18ceba7b40e24a9da87249bd74f16ea5abd6894.zip op-kernel-dev-a18ceba7b40e24a9da87249bd74f16ea5abd6894.tar.gz |
Merge branch 'master'
Diffstat (limited to 'include/asm-x86_64/param.h')
-rw-r--r-- | include/asm-x86_64/param.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-x86_64/param.h b/include/asm-x86_64/param.h index 40b1193..5956b23 100644 --- a/include/asm-x86_64/param.h +++ b/include/asm-x86_64/param.h @@ -1,9 +1,8 @@ -#include <linux/config.h> - #ifndef _ASMx86_64_PARAM_H #define _ASMx86_64_PARAM_H #ifdef __KERNEL__ +# include <linux/config.h> # define HZ CONFIG_HZ /* Internal kernel timer frequency */ # define USER_HZ 100 /* .. some user interfaces are in "ticks */ #define CLOCKS_PER_SEC (USER_HZ) /* like times() */ |