2009-04-22 19:05:00

by Coly Li

[permalink] [raw]
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 <[email protected]>
Cc: Russell King <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
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