Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / asm-i386 / param.h

diff --git a/include/asm-i386/param.h b/include/asm-i386/param.h
index f53d781..745dc5b 100644 (file)
--- a/include/asm-i386/param.h
+++ b/include/asm-i386/param.h
@@ -1,14 +1,8 @@
 #ifndef _ASMi386_PARAM_H
 #define _ASMi386_PARAM_H
 
-#include <linux/config.h>
-
 #ifdef __KERNEL__
-# ifdef CONFIG_KERNEL_HZ
-#  define HZ           CONFIG_KERNEL_HZ
-# else
-#  define HZ           1000            /* Internal kernel timer frequency */
-# endif
+# 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