diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-22 04:19:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-22 04:19:30 -0400 |
| commit | eff430de53be6f3328c3eebe93755f1ecf499e37 (patch) | |
| tree | c8e5ae958fe3e6656b4e96c83bbda17e649321a2 /arch/arm/mach-msm/timer.c | |
| parent | 9cbdb702092a2d82f909312f4ec3eeded77bb82e (diff) | |
| parent | 91e8549bde9e5cc88c5a2e8c8114389279e240b5 (diff) | |
Merge branch 'linus' into perf/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
| -rw-r--r-- | arch/arm/mach-msm/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 56f920c55b6a..38b95e949d13 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c | |||
| @@ -269,7 +269,7 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt) | |||
| 269 | 269 | ||
| 270 | /* Use existing clock_event for cpu 0 */ | 270 | /* Use existing clock_event for cpu 0 */ |
| 271 | if (!smp_processor_id()) | 271 | if (!smp_processor_id()) |
| 272 | return; | 272 | return 0; |
| 273 | 273 | ||
| 274 | writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL); | 274 | writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL); |
| 275 | 275 | ||