summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/zevio-timer.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-05-14 01:34:35 +0200
committerRob Herring <robh@kernel.org>2014-05-14 01:34:35 +0200
commiteafd370dfe487facfdef499057f4eac9aa0b4bf5 (patch)
tree0925a67cd658cdf4811f49b4cd2073f663166bd0 /drivers/clocksource/zevio-timer.c
parentof: push struct boot_param_header and defines into powerpc (diff)
parentof/selftest: add testcase for nodes with same name and address (diff)
downloadlinux-eafd370dfe487facfdef499057f4eac9aa0b4bf5.tar.xz
linux-eafd370dfe487facfdef499057f4eac9aa0b4bf5.zip
Merge branch 'dt-bus-name' into for-next
Diffstat (limited to 'drivers/clocksource/zevio-timer.c')
-rw-r--r--drivers/clocksource/zevio-timer.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/clocksource/zevio-timer.c b/drivers/clocksource/zevio-timer.c
index ca81809d159d..7ce442148c3f 100644
--- a/drivers/clocksource/zevio-timer.c
+++ b/drivers/clocksource/zevio-timer.c
@@ -212,4 +212,9 @@ error_free:
return ret;
}
-CLOCKSOURCE_OF_DECLARE(zevio_timer, "lsi,zevio-timer", zevio_timer_add);
+static void __init zevio_timer_init(struct device_node *node)
+{
+ BUG_ON(zevio_timer_add(node));
+}
+
+CLOCKSOURCE_OF_DECLARE(zevio_timer, "lsi,zevio-timer", zevio_timer_init);