Merge remote-tracking branch 'asoc/topic/pcm3168a' into asoc-next

[mirror_ubuntu-artful-kernel.git] / drivers / net / ethernet / ti / cpts.c

diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
index 0c0d48e5bea4ee709764a3cecb22e2490ec0694a..32279d21c8363d4976c6d313599fbc0e015e6a36 100644 (file)
--- a/drivers/net/ethernet/ti/cpts.c
+++ b/drivers/net/ethernet/ti/cpts.c
@@ -121,7 +121,7 @@ static int cpts_fifo_read(struct cpts *cpts, int match)
        return type == match ? 0 : -1;
 }
 
-static cycle_t cpts_systim_read(const struct cyclecounter *cc)
+static u64 cpts_systim_read(const struct cyclecounter *cc)
 {
        u64 val = 0;
        struct cpts_event *event;