---

yaml --- r: 359107 b: refs/heads/master c: 00f4e13 h: refs/heads/master i: 359105: 64d03d9 359103: b555320 v: v3
git-mirror · Feb 22, 2013 · 8790ac2 · 8790ac2
1 parent 0d09da0
commit 8790ac2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e182bb38d7db7494fa5dcd82da17fe0dedf60ecf
+refs/heads/master: 00f4e13c4634b10f6a16b26a980b22a53dfa6bb5
diff --git a/trunk/drivers/clocksource/nomadik-mtu.c b/trunk/drivers/clocksource/nomadik-mtu.c
@@ -226,5 +226,6 @@ void __init nmdk_timer_init(void __iomem *base, int irq)
 	/* Timer 1 is used for events, register irq and clockevents */
 	setup_irq(irq, &nmdk_timer_irq);
 	nmdk_clkevt.cpumask = cpumask_of(0);
+	nmdk_clkevt.irq = irq;
 	clockevents_config_and_register(&nmdk_clkevt, rate, 2, 0xffffffffU);
 }