Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / include / asm-alpha / param.h

diff --git a/include/asm-alpha/param.h b/include/asm-alpha/param.h
index 3ed0b3b02e52c5a2b739af40c00be241fc73c4e1..0982f1d39499fbe337b440cc995913e2fbbb792d 100644 (file)
--- a/include/asm-alpha/param.h
+++ b/include/asm-alpha/param.h
@@ -5,16 +5,7 @@
    hardware ignores reprogramming.  We also need userland buy-in to the 
    change in HZ, since this is visible in the wait4 resources etc.  */
 
-#include <linux/config.h>
-
-#ifndef HZ
-# ifndef CONFIG_ALPHA_RAWHIDE
-#  define HZ   1024
-# else
-#  define HZ   1200
-# endif
-#endif
-
+#define HZ             CONFIG_HZ
 #define USER_HZ                HZ
 
 #define EXEC_PAGESIZE  8192