From 8790ac21d23c9a47c96c0ec01b89dc9c00c45902 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Fri, 22 Feb 2013 16:44:30 +0100 Subject: [PATCH] --- yaml --- r: 359107 b: refs/heads/master c: 00f4e13c4634b10f6a16b26a980b22a53dfa6bb5 h: refs/heads/master i: 359105: 64d03d911b1117104dc85e0315035bc6aa2df2b9 359103: b555320ed9e4c1e43d23fbf5462f43b31c255b2f v: v3 --- [refs] | 2 +- trunk/drivers/clocksource/nomadik-mtu.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6e8507e4c22e..4501504e9f55 100644 --- 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 index 8914c3c1c88b..7cbcaa02f52c 100644 --- 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); }