summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-11-27 20:34:51 -0700
committerTom Rini <trini@ti.com>2012-11-27 20:34:51 -0700
commitd41b3cc16fd97da23900f79e8fefdeedeebde8f6 (patch)
tree15a07a2f4503ac5d5364432ba52890910cdbb52d
parent7798f6dbd5e1a3030ed81a81da5dfb57c3307cac (diff)
parent8ab36d2e5490ea7bd5a39fd65210533a6c478e28 (diff)
downloadu-boot-imx-d41b3cc16fd97da23900f79e8fefdeedeebde8f6.zip
u-boot-imx-d41b3cc16fd97da23900f79e8fefdeedeebde8f6.tar.gz
u-boot-imx-d41b3cc16fd97da23900f79e8fefdeedeebde8f6.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mips
-rw-r--r--arch/mips/cpu/mips32/time.c1
-rw-r--r--arch/mips/cpu/mips64/time.c1
2 files changed, 0 insertions, 2 deletions
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 @@ 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 5154280..720f7b7 100644
--- 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;