Merge branches 'bkl-removal', 'cma', 'ehca', 'for-2.6.27', 'mlx4', 'mthca' and 'nes...

[pandora-kernel.git] / include / asm-v850 / param.h

diff --git a/include/asm-v850/param.h b/include/asm-v850/param.h
index 3c65bd5..4391f5f 100644 (file)
--- a/include/asm-v850/param.h
+++ b/include/asm-v850/param.h
@@ -23,10 +23,11 @@
 #define MAXHOSTNAMELEN 64      /* max length of hostname */
 
 #ifdef __KERNEL__
-#include <asm/machdep.h>       /* For HZ */
-
+# define HZ            CONFIG_HZ
 # define USER_HZ       100
 # define CLOCKS_PER_SEC        USER_HZ
+#else
+# define HZ            100
 #endif
 
 #endif /* __V850_PARAM_H__ */