git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
kernel
/
csrc-r4k.c
diff --git
a/arch/mips/kernel/csrc-r4k.c
b/arch/mips/kernel/csrc-r4k.c
index f1a2893931edc99327763fa3f711da0351336883..e95a3cd48eeacac0c03f22b8e8ac2fcf2e3a7f52 100644
(file)
--- a/
arch/mips/kernel/csrc-r4k.c
+++ b/
arch/mips/kernel/csrc-r4k.c
@@
-10,7
+10,7
@@
#include <asm/time.h>
-static cycle_t c0_hpt_read(
void
)
+static cycle_t c0_hpt_read(
struct clocksource *cs
)
{
return read_c0_count();
}