[PATCH] x86/mrst: match clocksource prototype change

From: Jacob Pan
Date: Wed Mar 03 2010 - 06:05:58 EST

Function prototype in clocksource.resume has been changed by commit 17622339.
This patch makes the APB timer resume function match with the new prototype,
otherwise GCC would complain incompatible pointer assignment.

Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx>
arch/x86/kernel/apb_timer.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index 83a345b..1232fe7 100644
--- 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;
@@ -248,7 +248,7 @@ static irqreturn_t apbt_interrupt_handler(int irq, void *data)

-static void apbt_restart_clocksource(void)
+static void apbt_restart_clocksource(struct clocksource *cs)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/