summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-15 10:56:50 -0800
committerOlof Johansson <olof@lixom.net>2013-01-15 10:57:24 -0800
commit2ea0dde7653342d363144b17cb39932e27428e9a (patch)
treeb4316bb625ef7f216713e0f1221bdfff8a113379 /drivers/clocksource
parentf8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff)
parent41d16512ebea6938b95c5e4f2ae008914e91abc1 (diff)
Merge branch 'vt8500/timer' into next/cleanup
* vt8500/timer: timer: vt8500: Convert vt8500 to use CLKSRC_OF Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/vt8500_timer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c
index ed66cf07d3c6..8efc86b5b5dd 100644
--- a/drivers/clocksource/vt8500_timer.c
+++ b/drivers/clocksource/vt8500_timer.c
@@ -134,7 +134,7 @@ static struct of_device_id vt8500_timer_ids[] = {
{ }
};
-void __init vt8500_timer_init(void)
+static void __init vt8500_timer_init(void)
{
struct device_node *np;
int timer_irq;
@@ -177,3 +177,4 @@ void __init vt8500_timer_init(void)
4, 0xf0000000);
}
+CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init)