From efc1281992805d6b9c41ca932cdb8021fb836429 Mon Sep 17 00:00:00 2001
From: Coly Li <coly.li@suse.de>
Date: Thu, 23 Apr 2009 03:06:06 +0800
Subject: [PATCH] --- yaml --- r: 144968 b: refs/heads/master c:
 d0ce9a5a47113eec041a0972a0b86134b8fd2828 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/mips/cavium-octeon/csrc-octeon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f81811ecea3e..2077e692ef90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c21004cd5b4cb7d479514d470a62366e8307412c
+refs/heads/master: d0ce9a5a47113eec041a0972a0b86134b8fd2828
diff --git a/trunk/arch/mips/cavium-octeon/csrc-octeon.c b/trunk/arch/mips/cavium-octeon/csrc-octeon.c
index 70fd92c31657..96110f217dcd 100644
--- a/trunk/arch/mips/cavium-octeon/csrc-octeon.c
+++ b/trunk/arch/mips/cavium-octeon/csrc-octeon.c
@@ -38,7 +38,7 @@ void octeon_init_cvmcount(void)
 	local_irq_restore(flags);
 }
 
-static cycle_t octeon_cvmcount_read(void)
+static cycle_t octeon_cvmcount_read(struct clocksource *cs)
 {
 	return read_c0_cvmcount();
 }