---

yaml --- r: 374195 b: refs/heads/master c: b2a93b1 h: refs/heads/master i: 374193: ca0bd17 374191: fcce5be v: v3
git-mirror · Apr 11, 2013 · 6cc02cf · 6cc02cf
1 parent cbb511a
commit 6cc02cf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34c2e5feeb0164baef76555141ad5b8dc84394bb
+refs/heads/master: b2a93b1d6b0d1af00e4796f3ef1252d2862513e3
diff --git a/trunk/arch/arm/mach-vexpress/v2m.c b/trunk/arch/arm/mach-vexpress/v2m.c
@@ -61,9 +61,6 @@ static void __init v2m_sp804_init(void __iomem *base, unsigned int irq)
 	if (WARN_ON(!base || irq == NO_IRQ))
 		return;
 
-	writel(0, base + TIMER_1_BASE + TIMER_CTRL);
-	writel(0, base + TIMER_2_BASE + TIMER_CTRL);
-
 	sp804_clocksource_init(base + TIMER_2_BASE, "v2m-timer1");
 	sp804_clockevents_init(base + TIMER_1_BASE, irq, "v2m-timer0");
 }