From 17065dc885e0d29cc552223a836305310aba4848 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 27 Sep 2009 17:32:47 +0100
Subject: [PATCH] --- yaml --- r: 166741 b: refs/heads/master c:
 fac28e6df9b5fdfa0cf6b99eae022609dd1108d5 h: refs/heads/master i:   166739:
 48922b2a7e778c38965fb5ee1db471b757fe2937 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-sa1100/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1d088787235a..554fa6075739 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f944ab115f64fefa2c8ae985aafe652179fce4f
+refs/heads/master: fac28e6df9b5fdfa0cf6b99eae022609dd1108d5
diff --git a/trunk/arch/arm/mach-sa1100/time.c b/trunk/arch/arm/mach-sa1100/time.c
index 95d92e8e56a8..b9cbb56d6e9d 100644
--- a/trunk/arch/arm/mach-sa1100/time.c
+++ b/trunk/arch/arm/mach-sa1100/time.c
@@ -77,7 +77,7 @@ static struct clock_event_device ckevt_sa1100_osmr0 = {
 	.set_mode	= sa1100_osmr0_set_mode,
 };
 
-static cycle_t sa1100_read_oscr(void)
+static cycle_t sa1100_read_oscr(struct clocksource *s)
 {
 	return OSCR;
 }