Fix powerpc build of clocksource pass clocksource mods:
arch/powerpc/kernel/time.c:88: warning: initialization from incompatible pointer type
arch/powerpc/kernel/time.c:99: warning: initialization from incompatible pointer type
arch/powerpc/kernel/time.c:770: error: conflicting types for 'rtc_read'
arch/powerpc/kernel/time.c:80: error: previous declaration of 'rtc_read' was here
arch/powerpc/kernel/time.c:775: error: conflicting types for 'timebase_read'
arch/powerpc/kernel/time.c:91: error: previous declaration of 'timebase_read' was here
make[1]: *** [arch/powerpc/kernel/time.o] Error 1
make: *** [arch/powerpc/kernel] Error 2
Signed-off-by: Hugh Dickins <hugh@veritas.com>
---
Follow clocksource-pass-clocksource-to-read-callback-v2.patch
arch/powerpc/kernel/time.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- mmotm/arch/powerpc/kernel/time.c 2008-12-16 18:05:13.000000000 +0000
+++ fixed/arch/powerpc/kernel/time.c 2008-12-16 19:19:51.000000000 +0000
@@ -77,7 +77,7 @@
#include <linux/clockchips.h>
#include <linux/clocksource.h>
-static cycle_t rtc_read(void);
+static cycle_t rtc_read(struct clocksource *);
static struct clocksource clocksource_rtc = {
.name = "rtc",
.rating = 400,
@@ -88,7 +88,7 @@ static struct clocksource clocksource_rt
.read = rtc_read,
};
-static cycle_t timebase_read(void);
+static cycle_t timebase_read(struct clocksource *);
static struct clocksource clocksource_timebase = {
.name = "timebase",
.rating = 400,
--
