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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
alchemy
/
common
/
time.c
diff --git
a/arch/mips/alchemy/common/time.c
b/arch/mips/alchemy/common/time.c
index f58d4ffb89456c1c1d6d3076906631946b1aba48..33fbae79af5e6660f33fc404b0a1f5781829950e 100644
(file)
--- a/
arch/mips/alchemy/common/time.c
+++ b/
arch/mips/alchemy/common/time.c
@@
-44,7
+44,7
@@
extern int allow_au1k_wait; /* default off for CP0 Counter */
-static cycle_t au1x_counter1_read(
void
)
+static cycle_t au1x_counter1_read(
struct clocksource *cs
)
{
return au_readl(SYS_RTCREAD);
}