Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / kernel / apb_timer.c

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index 2afa27d01297c23a274341c8e4eca6c47898e50f..4b7099526d2c1c8c6c496f4ce0f8e028fbac9eab 100644 (file)
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -69,7 +69,7 @@ static void apbt_set_mode(enum clock_event_mode mode,
 static int apbt_next_event(unsigned long delta,
                           struct clock_event_device *evt);
 static cycle_t apbt_read_clocksource(struct clocksource *cs);
-static void apbt_restart_clocksource(void);
+static void apbt_restart_clocksource(struct clocksource *cs);
 
 struct apbt_dev {
        struct clock_event_device evt;
@@ -249,7 +249,7 @@ static irqreturn_t apbt_interrupt_handler(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static void apbt_restart_clocksource(void)
+static void apbt_restart_clocksource(struct clocksource *cs)
 {
        apbt_start_counter(phy_cs_timer_id);
 }