Merge branches 'release' and 'hp-cid' into release

[linux-2.6-omap-h63xx.git] / include / asm-s390 / param.h

diff --git a/include/asm-s390/param.h b/include/asm-s390/param.h
index 085a7e229b2377e9a6c462d255f597e3a995e25c..34aaa4603347f46f4125a2d787ef256a854037d3 100644 (file)
--- a/include/asm-s390/param.h
+++ b/include/asm-s390/param.h
@@ -10,7 +10,7 @@
 #define _ASMS390_PARAM_H
 
 #ifdef __KERNEL__
-# define HZ            100             /* 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