summaryrefslogtreecommitdiff
path: root/arch/mips/cavium-octeon/csrc-octeon.c
diff options
context:
space:
mode:
authorColy Li <coly.li@suse.de>2009-04-23 03:06:06 +0800
committerRalf Baechle <ralf@linux-mips.org>2009-05-14 13:50:29 +0100
commitd0ce9a5a47113eec041a0972a0b86134b8fd2828 (patch)
tree661bd74720bffb033e0b5a49f876102f21ee83bc /arch/mips/cavium-octeon/csrc-octeon.c
parentc21004cd5b4cb7d479514d470a62366e8307412c (diff)
MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read()
This patch modifies parameter of octeon_cvmcount_read() from 'void' to 'struct clocksource *cs', which fixes compile warning for incompatible parameter type. Signed-off-by: Coly Li <coly.li@suse.de> Cc: David Daney <ddaney@caviumnetworks.com> Cc: Ingo Molnar <mingo@elte.hu> Reviewed-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cavium-octeon/csrc-octeon.c')
-rw-r--r--arch/mips/cavium-octeon/csrc-octeon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c
index 70fd92c31657..96110f217dcd 100644
--- a/arch/mips/cavium-octeon/csrc-octeon.c
+++ b/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();
}