Fix merge problems

[karo-tx-uboot.git] / lib_m68k / time.c

diff --git a/lib_m68k/time.c b/lib_m68k/time.c
index 28d371d5e68f31b7926d12f1a74e7b7a8f3e7e91..6eba784b5c12844b13826cdddfb1758ce9286c78 100644 (file)
--- a/lib_m68k/time.c
+++ b/lib_m68k/time.c
@@ -199,6 +199,11 @@ unsigned long long get_ticks(void)
        return get_timer(0);
 }
 
+unsigned long usec2ticks(unsigned long usec)
+{
+       return get_timer(usec);
+}
+
 /*
  * This function is derived from PowerPC code (timebase clock frequency).
  * On M68K it returns the number of timer ticks per second.