From: Olof Johansson <olof@lixom.net>
Date: Tue, 15 Jan 2013 18:56:50 +0000 (-0800)
Subject: Merge branch 'vt8500/timer' into next/cleanup
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2ea0dde7653342d363144b17cb39932e27428e9a;p=deliverable%2Flinux.git

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>
---

2ea0dde7653342d363144b17cb39932e27428e9a
diff --cc drivers/clocksource/vt8500_timer.c
index ed66cf07d3c6,b75b8e31dab4..8efc86b5b5dd
--- a/drivers/clocksource/vt8500_timer.c
+++ b/drivers/clocksource/vt8500_timer.c
@@@ -173,7 -179,7 +173,8 @@@ static void __init vt8500_timer_init(vo
  	if (setup_irq(timer_irq, &irq))
  		pr_err("%s: setup_irq failed for %s\n", __func__,
  							clockevent.name);
 -	clockevents_register_device(&clockevent);
 +	clockevents_config_and_register(&clockevent, VT8500_TIMER_HZ,
 +					4, 0xf0000000);
  }
  
+ CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init)