Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --git a/include/asm-m32r/param.h b/include/asm-m32r/param.h
index 750b938ccb52a5b5459bf254601ce7eaaeeb66bd..94c770196048335767a40f9fd8fd649d11f1effb 100644 (file)
--- a/include/asm-m32r/param.h
+++ b/include/asm-m32r/param.h
@@ -1,12 +1,8 @@
 #ifndef _ASM_M32R_PARAM_H
 #define _ASM_M32R_PARAM_H
 
-/* $Id$ */
-
-/* orig : i386 2.5.67 */
-
 #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