summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/sa1100/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/cpu/sa1100/timer.c')
-rw-r--r--arch/arm/cpu/sa1100/timer.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 12514e4dbc9..0fac5c1707f 100644
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -12,22 +12,17 @@
#include <common.h>
#include <SA-1100.h>
-ulong get_timer (ulong base)
-{
- return get_timer_masked ();
-}
-
-void __udelay (unsigned long usec)
+static ulong get_timer_masked (void)
{
- udelay_masked (usec);
+ return OSCR;
}
-ulong get_timer_masked (void)
+ulong get_timer (ulong base)
{
- return OSCR;
+ return get_timer_masked ();
}
-void udelay_masked (unsigned long usec)
+void __udelay (unsigned long usec)
{
ulong tmo;
ulong endtime;