Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[linux.git] / arch / mn10300 / kernel / csrc-mn10300.c

diff --git a/arch/mn10300/kernel/csrc-mn10300.c b/arch/mn10300/kernel/csrc-mn10300.c
index 45644cf18c41245904722c405d7faeff4861838a..6b74df3661f22aa1dbf13b77b7b68702da0fbe98 100644 (file)
--- a/arch/mn10300/kernel/csrc-mn10300.c
+++ b/arch/mn10300/kernel/csrc-mn10300.c
@@ -13,7 +13,7 @@
 #include <asm/timex.h>
 #include "internal.h"
 
-static cycle_t mn10300_read(struct clocksource *cs)
+static u64 mn10300_read(struct clocksource *cs)
 {
        return read_timestamp_counter();
 }