diff options
author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /include/asm-ppc64/param.h | |
parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
download | op-kernel-dev-129521dcc94f781890f8f668219ab79f0073ff9f.zip op-kernel-dev-129521dcc94f781890f8f668219ab79f0073ff9f.tar.gz |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'include/asm-ppc64/param.h')
-rw-r--r-- | include/asm-ppc64/param.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ppc64/param.h b/include/asm-ppc64/param.h index 1fad38d..76c212d 100644 --- a/include/asm-ppc64/param.h +++ b/include/asm-ppc64/param.h @@ -1,6 +1,8 @@ #ifndef _ASM_PPC64_PARAM_H #define _ASM_PPC64_PARAM_H +#include <linux/config.h> + /* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -9,7 +11,7 @@ */ #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) /* like times() */ #endif |