Merge branch 'core/iommu' into core/urgent

[sfrench/cifs-2.6.git] / arch / arm / plat-mxc / include / mach / timex.h

diff --git a/arch/arm/plat-mxc/include/mach/timex.h b/arch/arm/plat-mxc/include/mach/timex.h
index 0b0af0253e912124d69cb4eacaedf7c1703b2ecf..07b4a73c9d2f3135400e3b6aa8ac889c4a352758 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/timex.h
+++ b/arch/arm/plat-mxc/include/mach/timex.h
@@ -20,6 +20,12 @@
 #ifndef __ASM_ARCH_MXC_TIMEX_H__
 #define __ASM_ARCH_MXC_TIMEX_H__
 
-#include <mach/hardware.h>     /* for CLOCK_TICK_RATE */
+#if defined CONFIG_ARCH_MX1
+#define CLOCK_TICK_RATE                16000000
+#elif defined CONFIG_ARCH_MX2
+#define CLOCK_TICK_RATE                13300000
+#elif defined CONFIG_ARCH_MX3
+#define CLOCK_TICK_RATE                16625000
+#endif
 
 #endif                         /* __ASM_ARCH_MXC_TIMEX_H__ */