Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / timex.h

diff --git a/arch/arm/plat-omap/include/mach/timex.h b/arch/arm/plat-omap/include/mach/timex.h
index 6d35767bc48f0f1ebb1e682ab46ead9f9d697e5c..b3f5ea96e056a31d5c203a4d09ad8d6ffd0b5512 100644 (file)
--- a/arch/arm/plat-omap/include/mach/timex.h
+++ b/arch/arm/plat-omap/include/mach/timex.h
@@ -38,4 +38,6 @@
 #define CLOCK_TICK_RATE                (HZ * 100000UL)
 #endif
 
+extern struct sys_timer omap_timer;
+
 #endif /* __ASM_ARCH_OMAP_TIMEX_H */