[<prev] [next>] [day] [month] [year] [list]
Message-ID: <49EF6A69.7070004@suse.de>
Date: Thu, 23 Apr 2009 03:05:13 +0800
From: Coly Li <coly.li@...e.de>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Russell King <rmk@...-67.arm.linux.org.uk>,
Ingo Molnar <mingo@...e.hu>
Subject: [PATCH 2/7] mach-sa1100: add parameter to sa1100_read_oscr()
This patch modifies parameter of sa1100_read_oscr() from 'void' to 'struct
clocksource *cs', which fixes compile warning for incompatible parameter type.
Signed-off-by: Coly Li <coly.li@...e.de>
Cc: Russell King <rmk@...-67.arm.linux.org.uk>
Cc: Ingo Molnar <mingo@...e.hu>
---
arch/arm/mach-sa1100/time.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 711c029..f6f1e5b 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -77,7 +77,7 @@ static struct clock_event_device ckevt_sa1100_osmr0 = {
.set_mode = sa1100_osmr0_set_mode,
};
-static cycle_t sa1100_read_oscr(void)
+static cycle_t sa1100_read_oscr(struct clocksource *cs)
{
return OSCR;
}
--
Coly Li
SuSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists