From df5d490b367a1570bef25fcb729a1a087a828341 Mon Sep 17 00:00:00 2001
From: dmitry pervushin <dpervushin@embeddedalley.com>
Date: Sun, 3 May 2009 16:49:26 +0100
Subject: [PATCH] --- yaml --- r: 149387 b: refs/heads/master c:
 b4380b8e5888e5ef5872e43b610c9dac4bf253ac h: refs/heads/master i:   149385:
 e5bbaf02673a955ac6667ad02c18a68710b24592   149383:
 9e6facfe49b3af441b8216c822c566fa67cdbad4 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/plat-stmp3xxx/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 302847ef96c3..a5b212a9639d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bd0f2f5fc5f51d351228488dfef5e33d28e8d0c
+refs/heads/master: b4380b8e5888e5ef5872e43b610c9dac4bf253ac
diff --git a/trunk/arch/arm/plat-stmp3xxx/timer.c b/trunk/arch/arm/plat-stmp3xxx/timer.c
index c916068f0cab..7d872f0aee70 100644
--- a/trunk/arch/arm/plat-stmp3xxx/timer.c
+++ b/trunk/arch/arm/plat-stmp3xxx/timer.c
@@ -45,7 +45,7 @@ stmp3xxx_timer_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static cycle_t stmp3xxx_clock_read(void)
+static cycle_t stmp3xxx_clock_read(struct clocksource *cs)
 {
 	return ~((HW_TIMROT_TIMCOUNTn_RD(1) & 0xFFFF0000) >> 16);
 }