summaryrefslogtreecommitdiff
path: root/cpu/microblaze/timer.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-09-24 00:08:37 +0200
committerMichal Simek <monstr@monstr.eu>2007-09-24 00:08:37 +0200
commitb90c045f035c3cc9b5d2edaed6048dfb74e40763 (patch)
treeee69b8872cf8c295a48244280c82d98e191111ab /cpu/microblaze/timer.c
parent6b6f287a33ae8c340f97fb08ed95b6687e2baa4b (diff)
downloadu-boot-b90c045f035c3cc9b5d2edaed6048dfb74e40763.tar.gz
u-boot-b90c045f035c3cc9b5d2edaed6048dfb74e40763.tar.bz2
u-boot-b90c045f035c3cc9b5d2edaed6048dfb74e40763.zip
synchronizition with mainline
Diffstat (limited to 'cpu/microblaze/timer.c')
-rw-r--r--cpu/microblaze/timer.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/cpu/microblaze/timer.c b/cpu/microblaze/timer.c
index b350453443..ab1cb12749 100644
--- a/cpu/microblaze/timer.c
+++ b/cpu/microblaze/timer.c
@@ -33,17 +33,10 @@ void reset_timer (void)
timestamp = 0;
}
-#ifdef CFG_TIMER_0
ulong get_timer (ulong base)
{
return (timestamp - base);
}
-#else
-ulong get_timer (ulong base)
-{
- return (timestamp++ - base);
-}
-#endif
void set_timer (ulong t)
{