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

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

diff --git a/include/asm-xtensa/param.h b/include/asm-xtensa/param.h
index ce3a336cad07c188ebe7dc10805c2d6c060212a8..ba03d5aeab6b085d21bd0b14db47163552f04be7 100644 (file)
--- a/include/asm-xtensa/param.h
+++ b/include/asm-xtensa/param.h
@@ -12,9 +12,11 @@
 #define _XTENSA_PARAM_H
 
 #ifdef __KERNEL__
-# define HZ            100             /* internal timer frequency */
+# define HZ            CONFIG_HZ       /* internal timer frequency */
 # define USER_HZ       100             /* for user interfaces in "ticks" */
 # define CLOCKS_PER_SEC (USER_HZ)      /* frequnzy at which times() counts */
+#else
+# define HZ            100
 #endif
 
 #define EXEC_PAGESIZE  4096