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 'fix/asoc' into topic/asoc
[pandora-kernel.git]
/
arch
/
arm
/
mach-ns9xxx
/
time-ns9360.c
diff --git
a/arch/arm/mach-ns9xxx/time-ns9360.c
b/arch/arm/mach-ns9xxx/time-ns9360.c
index
41df697
..
7728126
100644
(file)
--- a/
arch/arm/mach-ns9xxx/time-ns9360.c
+++ b/
arch/arm/mach-ns9xxx/time-ns9360.c
@@
-25,7
+25,7
@@
#define TIMER_CLOCKEVENT 1
static u32 latch;
-static cycle_t ns9360_clocksource_read(
void
)
+static cycle_t ns9360_clocksource_read(
struct clocksource *cs
)
{
return __raw_readl(SYS_TR(TIMER_CLOCKSOURCE));
}