Merge tag 'irqchip-fixes-4.10' of git://git.infradead.org/users/jcooper/linux into...

[mirror_ubuntu-zesty-kernel.git] / drivers / clocksource / timer-prima2.c

diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c
index c32148ec7a384dc58921c40515786491033ff5e8..bfa981ac1eaf5908c14614d40e714634e867c4b8 100644 (file)
--- a/drivers/clocksource/timer-prima2.c
+++ b/drivers/clocksource/timer-prima2.c
@@ -72,7 +72,7 @@ static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id)
 }
 
 /* read 64-bit timer counter */
-static cycle_t notrace sirfsoc_timer_read(struct clocksource *cs)
+static u64 notrace sirfsoc_timer_read(struct clocksource *cs)
 {
        u64 cycles;