Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / arch / x86 / lib / tsc_timer.c

diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
index d931e5f5e0156a62455e36c3873d4a0e849616ed..c509801f9e8dee6539ac335e870748eb165aa62c 100644 (file)
--- a/arch/x86/lib/tsc_timer.c
+++ b/arch/x86/lib/tsc_timer.c
@@ -98,6 +98,10 @@ void __udelay(unsigned long usec)
 
 int timer_init(void)
 {
-       /* Nothing to do here - the timer needs no init */
+#ifdef CONFIG_SYS_PCAT_TIMER
+       /* Set up the PCAT timer if required */
+       pcat_timer_init();
+#endif
+
        return 0;
 }