Merge commit 'v2.6.32-rc7' into core/iommu

[platform/kernel/linux-starfive.git] / arch / ia64 / kernel / time.c

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 604c1a3..4990495 100644 (file)
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -385,7 +385,7 @@ ia64_init_itm (void)
 
 static cycle_t itc_get_cycles(struct clocksource *cs)
 {
-       u64 lcycle, now, ret;
+       unsigned long lcycle, now, ret;
 
        if (!itc_jitter_data.itc_jitter)
                return get_cycles();