projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.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/tiwai/sound-2.6
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
mips
/
kernel
/
csrc-bcm1480.c
diff --git
a/arch/mips/kernel/csrc-bcm1480.c
b/arch/mips/kernel/csrc-bcm1480.c
index
868745e
..
51489f8
100644
(file)
--- a/
arch/mips/kernel/csrc-bcm1480.c
+++ b/
arch/mips/kernel/csrc-bcm1480.c
@@
-28,7
+28,7
@@
#include <asm/sibyte/sb1250.h>
-static cycle_t bcm1480_hpt_read(
void
)
+static cycle_t bcm1480_hpt_read(
struct clocksource *cs
)
{
return (cycle_t) __raw_readq(IOADDR(A_SCD_ZBBUS_CYCLE_COUNT));
}