diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-05-13 08:40:43 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-05-13 08:40:43 +0200 |
| commit | 09ffa131c773a041ecbc9ca4a8033493d69b89b9 (patch) | |
| tree | 7b7713e74608ad8aeea6832890d9cf2e3a320bd6 /drivers/clocksource/zevio-timer.c | |
| parent | 29a1f2333e07bbbecb920cc78fd035fe8f53207a (diff) | |
| parent | 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd (diff) | |
Merge tag 'v3.15-rc4' into devel
Linux 3.15-rc4
Diffstat (limited to 'drivers/clocksource/zevio-timer.c')
| -rw-r--r-- | drivers/clocksource/zevio-timer.c | 7 |
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); |