This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/asm-i386/param.h b/include/asm-i386/param.h
index 209cda1..b644052 100644 (file)
--- a/include/asm-i386/param.h
+++ b/include/asm-i386/param.h
@@ -1,24 +1,8 @@
 #ifndef _ASMi386_PARAM_H
 #define _ASMi386_PARAM_H
 
-#include <linux/config.h>
-
 #ifdef __KERNEL__
-
-#if defined(CONFIG_X86_HZ) && defined(CONFIG_KERNEL_HZ)
-#error MEF: fix up CONFIG to only use one of these
-#endif
-
-#ifdef CONFIG_X86_HZ
-# define HZ            CONFIG_X86_HZ
-#else
-# ifdef CONFIG_KERNEL_HZ
-#  define HZ           CONFIG_KERNEL_HZ
-# else
-#  define HZ           1000            /* Internal kernel timer frequency */
-# endif
-#endif
-
+# define HZ            1000            /* Internal kernel timer frequency */
 # define USER_HZ       100             /* .. some user interfaces are in "ticks" */
 # define CLOCKS_PER_SEC                (USER_HZ)       /* like times() */
 #endif