diff options
| author | Wanlong Gao <wanlong.gao@gmail.com> | 2011-06-01 22:37:43 +0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2012-12-18 21:10:20 -0800 |
| commit | 09378d7c21a806d5ddb75ebcae242d98cea30e44 (patch) | |
| tree | 7dd7d8581e04fc285fcea0bba8bbffd2b7d8ba5b /arch | |
| parent | 752451f01c4567b506bf4343082682dbb8fb30dd (diff) | |
| download | linux-3.10-09378d7c21a806d5ddb75ebcae242d98cea30e44.tar.gz linux-3.10-09378d7c21a806d5ddb75ebcae242d98cea30e44.tar.bz2 linux-3.10-09378d7c21a806d5ddb75ebcae242d98cea30e44.zip | |
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 <wanlong.gao@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/xtensa/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index ac62f9cf1e1..19b32a0eaeb 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(); } |