From bc2b27188cd496555d3c7e07c31b9d0bc96cce76 Mon Sep 17 00:00:00 2001
From: John Stultz <johnstul@us.ibm.com>
Date: Mon, 1 Nov 2010 13:12:27 -0700
Subject: [PATCH] --- yaml --- r: 230636 b: refs/heads/master c:
 1e2de47cddc70ae973cf468e2f2954b4ae80f4e3 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/avr32/kernel/time.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3fe0dba0a073..6a5b84a18e7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 992a88b62ca327f10d82dbad71a8c061d4229888
+refs/heads/master: 1e2de47cddc70ae973cf468e2f2954b4ae80f4e3
diff --git a/trunk/arch/avr32/kernel/time.c b/trunk/arch/avr32/kernel/time.c
index 668ed2817e51..05ad29112ff4 100644
--- a/trunk/arch/avr32/kernel/time.c
+++ b/trunk/arch/avr32/kernel/time.c
@@ -35,7 +35,6 @@ static struct clocksource counter = {
 	.rating		= 50,
 	.read		= read_cycle_count,
 	.mask		= CLOCKSOURCE_MASK(32),
-	.shift		= 16,
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -123,9 +122,7 @@ void __init time_init(void)
 
 	/* figure rate for counter */
 	counter_hz = clk_get_rate(boot_cpu_data.clk);
-	counter.mult = clocksource_hz2mult(counter_hz, counter.shift);
-
-	ret = clocksource_register(&counter);
+	ret = clocksource_register_hz(&counter, counter_hz);
 	if (ret)
 		pr_debug("timer: could not register clocksource: %d\n", ret);