projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'imx-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next...
[profile/ivi/kernel-x86-ivi.git]
/
arch
/
arm
/
mach-omap2
/
timer.c
diff --git
a/arch/arm/mach-omap2/timer.c
b/arch/arm/mach-omap2/timer.c
index
f62b509
..
ee7a6bf
100644
(file)
--- a/
arch/arm/mach-omap2/timer.c
+++ b/
arch/arm/mach-omap2/timer.c
@@
-601,7
+601,7
@@
void __init omap4_local_timer_init(void)
int err;
if (of_have_populated_dt()) {
-
twd_local_timer_of_register
();
+
clocksource_of_init
();
return;
}