summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/clksrc-of.c
diff options
context:
space:
mode:
authorArnd Bergmann2013-04-19 23:12:42 +0200
committerArnd Bergmann2013-04-19 23:12:42 +0200
commit22cf644e03419b4c3d002109b021c7482306f0bf (patch)
treedb426bcf5d4f7acfdbcaa5276b87d12cbb061fa1 /drivers/clocksource/clksrc-of.c
parentLinux 3.9-rc6 (diff)
parentARM: exynos: restore mach/regs-clock.h for exynos5 (diff)
downloadkernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.gz
kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.xz
kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.zip
Merge branch 'next/drivers' into late/multiplatform
Multiple parts of next/drivers are prerequisites for the final exynos multiplatform changes, so let's pull in the entire branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clocksource/clksrc-of.c')
-rw-r--r--drivers/clocksource/clksrc-of.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c
index bdabdaa8d00f..37f5325bec95 100644
--- a/drivers/clocksource/clksrc-of.c
+++ b/drivers/clocksource/clksrc-of.c
@@ -16,6 +16,7 @@
#include <linux/init.h>
#include <linux/of.h>
+#include <linux/clocksource.h>
extern struct of_device_id __clksrc_of_table[];
@@ -26,10 +27,10 @@ void __init clocksource_of_init(void)
{
struct device_node *np;
const struct of_device_id *match;
- void (*init_func)(void);
+ clocksource_of_init_fn init_func;
for_each_matching_node_and_match(np, __clksrc_of_table, &match) {
init_func = match->data;
- init_func();
+ init_func(np);
}
}