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 'bugzilla-13041' into release
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
kernel
/
cevt-txx9.c
diff --git
a/arch/mips/kernel/cevt-txx9.c
b/arch/mips/kernel/cevt-txx9.c
index eccf7d6096bd7b8cbdd9d2c4d2dd7ed2d4742a7a..2e911e3da8d38e219584835745a1ec7f584be367 100644
(file)
--- a/
arch/mips/kernel/cevt-txx9.c
+++ b/
arch/mips/kernel/cevt-txx9.c
@@
-22,7
+22,7
@@
static struct txx9_tmr_reg __iomem *txx9_cs_tmrptr;
-static cycle_t txx9_cs_read(
void
)
+static cycle_t txx9_cs_read(
struct clocksource *cs
)
{
return __raw_readl(&txx9_cs_tmrptr->trr);
}