Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>

1 files changed, 5 insertions, 0 deletions

diff --git a/lib_m68k/time.c b/lib_m68k/time.c
index 28d371d5e..6eba784b5 100644
--- 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.