Synchronize with U-BOOT mainline

[oweals/u-boot.git] / cpu / microblaze / timer.c

diff --git a/cpu/microblaze/timer.c b/cpu/microblaze/timer.c
index b350453443e8d09fbfdaa979df50284df1f57cd7..ab1cb127492b0c18dff5eb7d3884ae0af117bf3f 100644 (file)
--- 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)
 {