Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

[u-boot] / arch / arm / cpu / ixp / timer.c

diff --git a/arch/arm/cpu/ixp/timer.c b/arch/arm/cpu/ixp/timer.c
index c25e72fa5533a65aae5fd54072359a20bfdf8a8c..087ddf80ef7c9f28ea62c3ca4d7a14530edffa22 100644 (file)
--- a/arch/arm/cpu/ixp/timer.c
+++ b/arch/arm/cpu/ixp/timer.c
@@ -89,11 +89,6 @@ void reset_timer_masked(void)
        gd->timestamp = 0;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer_masked(void)
 {
        return tick_to_time(get_ticks());