diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 13:37:49 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 13:38:06 (GMT) |
| commit | 03068ff131c0a565e2cb26303a0df63467136723 (patch) | |
| tree | 23fd6cc7d3f21bda56f24d44f6de51fdfbe8dbb9 /arch/arm/mach-msm/timer.c | |
| parent | 32235b07b52e948900613e27c5cbd955d084ae8a (diff) | |
| parent | f0e615c3cb72b42191b558c130409335812621d8 (diff) | |
| download | linux-fsl-qoriq-03068ff131c0a565e2cb26303a0df63467136723.tar.xz | |
Staging: merge 2.6.39-rc4 into staging-next
This handles the removal of the samsung-laptop driver and other
minor merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 56f920c..38b95e9 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) /* Use existing clock_event for cpu 0 */ if (!smp_processor_id()) - return; + return 0; writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL); |