Merge branch 'next' of git://git.denx.de/u-boot

[karo-tx-uboot.git] / arch / arm / cpu / sa1100 / timer.c

diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 694c03ab17848acd6b053cddb089bfb0117be34b..53bec0b760d53d219120990217c2be2ee94a49e6 100644 (file)
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -44,12 +44,6 @@ void __udelay (unsigned long usec)
        udelay_masked (usec);
 }
 
-
-void reset_timer_masked (void)
-{
-       OSCR = 0;
-}
-
 ulong get_timer_masked (void)
 {
        return OSCR;