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();
 }