Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasem...

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

diff --git a/include/asm-arm/param.h b/include/asm-arm/param.h
index 94223d4d7e888da23c64b797b09e1c05af684f87..15806468ba72801a38320c3a131f7842b10045fa 100644 (file)
--- a/include/asm-arm/param.h
+++ b/include/asm-arm/param.h
@@ -11,12 +11,7 @@
 #define __ASM_PARAM_H
 
 #ifdef __KERNEL__
-# include <asm/arch/param.h>           /* for kernel version of HZ */
-
-# ifndef HZ
-#  define HZ           100             /* Internal kernel timer frequency */
-# endif
-
+# define HZ            CONFIG_HZ       /* Internal kernel timer frequency */
 # define USER_HZ       100             /* User interfaces are in "ticks" */
 # define CLOCKS_PER_SEC        (USER_HZ)       /* like times() */
 #else