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 'omap-clock-fixes' into omap-fixes
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-omap2
/
timer-gp.c
diff --git
a/arch/arm/mach-omap2/timer-gp.c
b/arch/arm/mach-omap2/timer-gp.c
index
7835048
..
f36aba1
100644
(file)
--- a/
arch/arm/mach-omap2/timer-gp.c
+++ b/
arch/arm/mach-omap2/timer-gp.c
@@
-180,7
+180,7
@@
static inline void __init omap2_gp_clocksource_init(void) {}
* clocksource
*/
static struct omap_dm_timer *gpt_clocksource;
-static cycle_t clocksource_read_cycles(
void
)
+static cycle_t clocksource_read_cycles(
struct clocksource *cs
)
{
return (cycle_t)omap_dm_timer_read_counter(gpt_clocksource);
}