git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
timer.c
diff --git
a/arch/arm/mach-msm/timer.c
b/arch/arm/mach-msm/timer.c
index
56f920c
..
38b95e9
100644
(file)
--- 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);