git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ctxfi' into for-linus
[pandora-kernel.git]
/
arch
/
mips
/
cavium-octeon
/
csrc-octeon.c
diff --git
a/arch/mips/cavium-octeon/csrc-octeon.c
b/arch/mips/cavium-octeon/csrc-octeon.c
index
70fd92c
..
96110f2
100644
(file)
--- 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();
}