Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[mirror_ubuntu-zesty-kernel.git] / drivers / char / hpet.c

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index be54e5331a4517899e0e4ace0c48418cbb082a0e..20b32bb8c2aff5f57aa93e4eaa657e5275bf9313 100644 (file)
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -69,9 +69,9 @@ static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;
 #ifdef CONFIG_IA64
 static void __iomem *hpet_mctr;
 
-static cycle_t read_hpet(struct clocksource *cs)
+static u64 read_hpet(struct clocksource *cs)
 {
-       return (cycle_t)read_counter((void __iomem *)hpet_mctr);
+       return (u64)read_counter((void __iomem *)hpet_mctr);
 }
 
 static struct clocksource clocksource_hpet = {