Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

[mirror_ubuntu-bionic-kernel.git] / drivers / clocksource / samsung_pwm_timer.c

diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c
index 54565bd0093bfc02673d6f27841315c589b8ad70..0093ece661fe613a1bb325b7df56ce48f246793e 100644 (file)
--- a/drivers/clocksource/samsung_pwm_timer.c
+++ b/drivers/clocksource/samsung_pwm_timer.c
@@ -307,7 +307,7 @@ static void samsung_clocksource_resume(struct clocksource *cs)
        samsung_time_start(pwm.source_id, true);
 }
 
-static cycle_t notrace samsung_clocksource_read(struct clocksource *c)
+static u64 notrace samsung_clocksource_read(struct clocksource *c)
 {
        return ~readl_relaxed(pwm.source_reg);
 }