Merge tag 'asoc-v3.16-rc1' into asoc-linus

[cascardo/linux.git] / drivers / clocksource / clksrc-of.c

diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c
index ae2e427..0093a8e 100644 (file)
--- a/drivers/clocksource/clksrc-of.c
+++ b/drivers/clocksource/clksrc-of.c
@@ -27,7 +27,7 @@ void __init clocksource_of_init(void)
 {
        struct device_node *np;
        const struct of_device_id *match;
-       clocksource_of_init_fn init_func;
+       of_init_fn_1 init_func;
        unsigned clocksources = 0;
 
        for_each_matching_node_and_match(np, __clksrc_of_table, &match) {