Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[cascardo/linux.git] / arch / mips / xilfpga / time.c

diff --git a/arch/mips/xilfpga/time.c b/arch/mips/xilfpga/time.c
index a1c0fc8..cbb3fca 100644 (file)
--- a/arch/mips/xilfpga/time.c
+++ b/arch/mips/xilfpga/time.c
@@ -22,7 +22,7 @@ void __init plat_time_init(void)
        struct clk *clk;
 
        of_clk_init(NULL);
-       clocksource_of_init();
+       clocksource_probe();
 
        np = of_get_cpu_node(0, NULL);
        if (!np) {