Merge master.kernel.org:/home/rmk/linux-2.6-arm

[firefly-linux-kernel-4.4.55.git] / arch / arm / plat-orion / time.c

diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c
index bdeb166b4b201b43f0cfb3914f25e13d26b89ea2..de8a001fc3a9d0a4fbb6622005ba596c645d7fd0 100644 (file)
--- a/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
@@ -41,7 +41,7 @@ static u32 ticks_per_jiffy;
 /*
  * Clocksource handling.
  */
-static cycle_t orion_clksrc_read(void)
+static cycle_t orion_clksrc_read(struct clocksource *cs)
 {
        return 0xffffffff - readl(TIMER0_VAL);
 }