Merge branch 'master' into next

[u-boot] / lib_i386 / pcat_timer.c

diff --git a/lib_i386/pcat_timer.c b/lib_i386/pcat_timer.c
index e282f649acf6ea1f84e39075ea72632a04abfbaf..1373fd125c81d1f792788ebf8ba837cf4dc9fee1 100644 (file)
--- a/lib_i386/pcat_timer.c
+++ b/lib_i386/pcat_timer.c
@@ -25,10 +25,13 @@
 #include <asm/io.h>
 #include <asm/i8254.h>
 #include <asm/ibmpc.h>
+#include <asm/interrupt.h>
 
 #define TIMER0_VALUE 0x04aa /* 1kHz 1.9318MHz / 1000 */
 #define TIMER2_VALUE 0x0a8e /* 440Hz */
 
+static int timer_init_done = 0;
+
 int timer_init(void)
 {
        /* initialize timer 0 and 2
@@ -52,6 +55,8 @@ int timer_init(void)
        irq_install_handler (0, timer_isr, NULL);
        unmask_irq (0);
 
+       timer_init_done = 1;
+
        return 0;
 }
 
@@ -66,7 +71,7 @@ static u16 read_pit(void)
 }
 
 /* this is not very exact */
-void udelay (unsigned long usec)
+void __udelay (unsigned long usec)
 {
        int counter;
        int wraps;