From: Wanlong Gao Date: Wed, 1 Jun 2011 14:37:43 +0000 (+0800) Subject: xtensa:fix the incompatible pointer type warning in time.c X-Git-Tag: next-20121205~115^2~25 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6baf51f763b46cd65259458f6fdd0f5d28941ff4;p=karo-tx-linux.git xtensa:fix the incompatible pointer type warning in time.c Fix the definition of the function ccount_read to be compatible to the member read of the structure clocksource. Signed-off-by: Wanlong Gao Signed-off-by: Chris Zankel --- diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index ac62f9cf1e10..19b32a0eaebc 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c @@ -31,7 +31,7 @@ unsigned long ccount_per_jiffy; /* per 1/HZ */ unsigned long nsec_per_ccount; /* nsec per ccount increment */ #endif -static cycle_t ccount_read(void) +static cycle_t ccount_read(struct clocksource *cs) { return (cycle_t)get_ccount(); }