Merge tag 'kvm-arm-for-v4.12-round2' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / clocksource / mxs_timer.c

diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c
index 0ba0a913b41d113e7459b6dc21e07e00bb0d0648..99b77aff08395e887e824cf28cd373ce3a1e1560 100644 (file)
--- a/drivers/clocksource/mxs_timer.c
+++ b/drivers/clocksource/mxs_timer.c
@@ -97,7 +97,7 @@ static void timrot_irq_acknowledge(void)
                     HW_TIMROT_TIMCTRLn(0) + STMP_OFFSET_REG_CLR);
 }
 
-static cycle_t timrotv1_get_cycles(struct clocksource *cs)
+static u64 timrotv1_get_cycles(struct clocksource *cs)
 {
        return ~((__raw_readl(mxs_timrot_base + HW_TIMROT_TIMCOUNTn(1))
                        & 0xffff0000) >> 16);