commit a1fe6aae7540ea1bab9fc984319b5930206507d8
author Tom Rini <trini@ti.com> Tue Nov 27 20:34:51 2012 -0700
committer Tom Rini <trini@ti.com> Tue Nov 27 20:34:51 2012 -0700
tree 15a07a2f4503ac5d5364432ba52890910cdbb52d
parent eb766ad7aa3738d9d6571e8f372a281aee4ba7b1
parent e48b61743cc505df21419631bbe2c9affaaa75f7

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

arch/mips/cpu/mips32/time.c

diff --git a/arch/mips/cpu/mips32/time.c b/arch/mips/cpu/mips32/time.c
index 350896a..09fc842 100644
--- a/arch/mips/cpu/mips32/time.c
+++ b/arch/mips/cpu/mips32/time.c
@@ -36,7 +36,6 @@
 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;

arch/mips/cpu/mips64/time.c

diff --git a/arch/mips/cpu/mips64/time.c b/arch/mips/cpu/mips64/time.c
index 5154280..720f7b7 100644
--- a/arch/mips/cpu/mips64/time.c
+++ b/arch/mips/cpu/mips64/time.c
@@ -37,7 +37,6 @@
 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;