diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/clocksource/sh_mtu2.c | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/clocksource/sh_mtu2.c')
-rw-r--r-- | drivers/clocksource/sh_mtu2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c index 973e714d6051..5fb78bfd73bb 100644 --- a/drivers/clocksource/sh_mtu2.c +++ b/drivers/clocksource/sh_mtu2.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/err.h> | 29 | #include <linux/err.h> |
30 | #include <linux/clockchips.h> | 30 | #include <linux/clockchips.h> |
31 | #include <linux/sh_timer.h> | 31 | #include <linux/sh_timer.h> |
32 | #include <linux/slab.h> | ||
32 | 33 | ||
33 | struct sh_mtu2_priv { | 34 | struct sh_mtu2_priv { |
34 | void __iomem *mapbase; | 35 | void __iomem *mapbase; |
@@ -221,15 +222,15 @@ static void sh_mtu2_register_clockevent(struct sh_mtu2_priv *p, | |||
221 | ced->cpumask = cpumask_of(0); | 222 | ced->cpumask = cpumask_of(0); |
222 | ced->set_mode = sh_mtu2_clock_event_mode; | 223 | ced->set_mode = sh_mtu2_clock_event_mode; |
223 | 224 | ||
225 | pr_info("sh_mtu2: %s used for clock events\n", ced->name); | ||
226 | clockevents_register_device(ced); | ||
227 | |||
224 | ret = setup_irq(p->irqaction.irq, &p->irqaction); | 228 | ret = setup_irq(p->irqaction.irq, &p->irqaction); |
225 | if (ret) { | 229 | if (ret) { |
226 | pr_err("sh_mtu2: failed to request irq %d\n", | 230 | pr_err("sh_mtu2: failed to request irq %d\n", |
227 | p->irqaction.irq); | 231 | p->irqaction.irq); |
228 | return; | 232 | return; |
229 | } | 233 | } |
230 | |||
231 | pr_info("sh_mtu2: %s used for clock events\n", ced->name); | ||
232 | clockevents_register_device(ced); | ||
233 | } | 234 | } |
234 | 235 | ||
235 | static int sh_mtu2_register(struct sh_mtu2_priv *p, char *name, | 236 | static int sh_mtu2_register(struct sh_mtu2_priv *p, char *name, |