summaryrefslogtreecommitdiffstats
path: root/lib_m68k/time.c
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2008-08-04 19:18:14 +0200
committerMarkus Klotzbuecher <mk@denx.de>2008-08-04 19:18:14 +0200
commit0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch)
treefc05bf5db93e5a9c1712d24a5efdff94685063c2 /lib_m68k/time.c
parentab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff)
parent81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff)
downloadtalos-obmc-uboot-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.gz
talos-obmc-uboot-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.zip
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'lib_m68k/time.c')
-rw-r--r--lib_m68k/time.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib_m68k/time.c b/lib_m68k/time.c
index 28d371d5e6..6eba784b5c 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.
OpenPOWER on IntegriCloud