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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos4
/
localtimer.c
diff --git
a/arch/arm/mach-exynos4/localtimer.c
b/arch/arm/mach-exynos4/localtimer.c
index
2a2993a
..
6bf3d0a
100644
(file)
--- a/
arch/arm/mach-exynos4/localtimer.c
+++ b/
arch/arm/mach-exynos4/localtimer.c
@@
-18,8
+18,9
@@
/*
* Setup the local clock events for a CPU.
*/
-
void
__cpuinit local_timer_setup(struct clock_event_device *evt)
+
int
__cpuinit local_timer_setup(struct clock_event_device *evt)
{
evt->irq = IRQ_LOCALTIMER;
twd_timer_setup(evt);
+ return 0;
}