Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6

[pandora-kernel.git] / include / asm-alpha / param.h

diff --git a/include/asm-alpha/param.h b/include/asm-alpha/param.h
index 214e799..e691ecf 100644 (file)
--- a/include/asm-alpha/param.h
+++ b/include/asm-alpha/param.h
@@ -5,16 +5,12 @@
    hardware ignores reprogramming.  We also need userland buy-in to the 
    change in HZ, since this is visible in the wait4 resources etc.  */
 
-
-#ifndef HZ
-# ifndef CONFIG_ALPHA_RAWHIDE
-#  define HZ   1024
-# else
-#  define HZ   1200
-# endif
-#endif
-
+#ifdef __KERNEL__
+#define HZ             CONFIG_HZ
 #define USER_HZ                HZ
+#else
+#define HZ             1024
+#endif
 
 #define EXEC_PAGESIZE  8192