aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/timers/timer-broadcast.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-05 07:53:39 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-05 07:53:39 -0500
commit5359c32eb7402124abc9964d5d53639fe0739cea (patch)
treed77b6967fe8420678bb9d1d936855ac0699c196a /arch/sh/kernel/timers/timer-broadcast.c
parent8916edef5888c5d8fe283714416a9ca95b4c3431 (diff)
parentfe0bdec68b77020281dc814805edfe594ae89e0f (diff)
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/sh/kernel/timers/timer-broadcast.c')
-rw-r--r--arch/sh/kernel/timers/timer-broadcast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/timers/timer-broadcast.c b/arch/sh/kernel/timers/timer-broadcast.c
index c2317635230f..96e8eaea1e62 100644
--- a/arch/sh/kernel/timers/timer-broadcast.c
+++ b/arch/sh/kernel/timers/timer-broadcast.c
@@ -51,7 +51,7 @@ void __cpuinit local_timer_setup(unsigned int cpu)
51 clk->mult = 1; 51 clk->mult = 1;
52 clk->set_mode = dummy_timer_set_mode; 52 clk->set_mode = dummy_timer_set_mode;
53 clk->broadcast = smp_timer_broadcast; 53 clk->broadcast = smp_timer_broadcast;
54 clk->cpumask = cpumask_of_cpu(cpu); 54 clk->cpumask = cpumask_of(cpu);
55 55
56 clockevents_register_device(clk); 56 clockevents_register_device(clk);
57} 57}