Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

[linux-2.6] / include / asm-arm / arch-imx / timex.h

diff --git a/include/asm-arm/arch-imx/timex.h b/include/asm-arm/arch-imx/timex.h
index 8c91674706b1f276e4a08e0f3ba0b73a1a8ef24b..e22ba789546cd8a317e2eb3ae310a8a22dc4931f 100644 (file)
--- a/include/asm-arm/arch-imx/timex.h
+++ b/include/asm-arm/arch-imx/timex.h
@@ -21,7 +21,6 @@
 #ifndef __ASM_ARCH_TIMEX_H
 #define __ASM_ARCH_TIMEX_H
 
-#include <asm/hardware.h>
-#define CLOCK_TICK_RATE                (CLK32)
+#define CLOCK_TICK_RATE                (16000000)
 
 #endif