projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'staging-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-zynq
/
common.c
diff --git
a/arch/arm/mach-zynq/common.c
b/arch/arm/mach-zynq/common.c
index 5a6e4e20ca0a98ae07d39d6b764d2f799fc1448d..6f39d03cc27eac777a243abcb5a08ea4c35e8d7c 100644
(file)
--- a/
arch/arm/mach-zynq/common.c
+++ b/
arch/arm/mach-zynq/common.c
@@
-154,7
+154,7
@@
static void __init zynq_timer_init(void)
zynq_clock_init();
of_clk_init(NULL);
- clocksource_
of_init
();
+ clocksource_
probe
();
}
static struct map_desc zynq_cortex_a9_scu_map __initdata = {