Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

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

diff --git a/include/asm-ia64/param.h b/include/asm-ia64/param.h
index 6c6b679b7a9e9d9cf08c418398e6a0f628c95b81..5e1e0d2d7baf3b7f8a1d3b95252bd9ed1dc20336 100644 (file)
--- a/include/asm-ia64/param.h
+++ b/include/asm-ia64/param.h
@@ -27,7 +27,7 @@
    */
 #  define HZ     32
 # else
-#  define HZ   1024
+#  define HZ   CONFIG_HZ
 # endif
 # define USER_HZ       HZ
 # define CLOCKS_PER_SEC        HZ      /* frequency at which times() counts */