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

diff --git a/arch/mips/cpu/mips32/time.c b/arch/mips/cpu/mips32/time.c
index 350896a2a5657e4cd08b2ab428fd6b1ce1e1ef1e..09fc842b502cd6dc18647ffb646aafbcd5874a95 100644 (file)
--- a/arch/mips/cpu/mips32/time.c
+++ b/arch/mips/cpu/mips32/time.c
@@ -36,7 +36,6 @@ static unsigned long timestamp;
 int timer_init(void)
 {
        /* Set up the timer for the first expiration. */
-       timestamp = 0;
        write_c0_compare(read_c0_count() + CYCLES_PER_JIFFY);
 
        return 0;

diff --git a/arch/mips/cpu/mips64/time.c b/arch/mips/cpu/mips64/time.c
index 51542808dd6a48c604dc0eaf3c33826e5b253b65..720f7b7f8cbada89007fbea88a93283b4e4a2d1e 100644 (file)
--- a/arch/mips/cpu/mips64/time.c
+++ b/arch/mips/cpu/mips64/time.c
@@ -37,7 +37,6 @@ static unsigned long timestamp;
 int timer_init(void)
 {
        /* Set up the timer for the first expiration. */
-       timestamp = 0;
        write_c0_compare(read_c0_count() + CYCLES_PER_JIFFY);
 
        return 0;