From c8f49608dfbb2976fd947ebc230560e691008ed4 Mon Sep 17 00:00:00 2001
From: Yi Li <yi.li@analog.com>
Date: Tue, 15 Sep 2009 02:08:50 +0000
Subject: [PATCH] --- yaml --- r: 177245 b: refs/heads/master c:
 f7036d649c88ad14b482b2787ffb1063c8a719d7 h: refs/heads/master i:   177243:
 86fe9f042dff2f431307c6c9f64437dbc5c2ec10 v: v3

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

diff --git a/[refs] b/[refs]
index 888d0b07a949..6c11ecebe731 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a022ba9ac12aefe6bbbdda4c9086e21b25b8939
+refs/heads/master: f7036d649c88ad14b482b2787ffb1063c8a719d7
diff --git a/trunk/arch/blackfin/kernel/time-ts.c b/trunk/arch/blackfin/kernel/time-ts.c
index 359cfb1815ca..a54e569e3b62 100644
--- a/trunk/arch/blackfin/kernel/time-ts.c
+++ b/trunk/arch/blackfin/kernel/time-ts.c
@@ -108,7 +108,7 @@ void __init setup_gptimer0(void)
 	enable_gptimers(TIMER0bit);
 }
 
-static cycle_t bfin_read_gptimer0(void)
+static cycle_t bfin_read_gptimer0(struct clocksource *cs)
 {
 	return bfin_read_TIMER0_COUNTER();
 }