summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColy Li <coly.li@suse.de>2009-04-30 22:43:46 +0000
committerKyle McMartin <kyle@mcmartin.ca>2009-07-03 03:34:08 +0000
commitebc30a0f67a4d6a9470556f4311478b3b04c2b1f (patch)
tree909a30bd97b95ac05612aaee1c1112b187fc2379
parente9b2601073aa57ffde7259afbe86f405060058e3 (diff)
downloadlinux-stable-ebc30a0f67a4d6a9470556f4311478b3b04c2b1f.tar.gz
linux-stable-ebc30a0f67a4d6a9470556f4311478b3b04c2b1f.tar.bz2
linux-stable-ebc30a0f67a4d6a9470556f4311478b3b04c2b1f.zip
parisc: add parameter to read_cr16()
This patch modifies parameter of au1x_counter1_read() from 'void' to 'struct clocksource *cs', which fixes compile warning for incompatible parameter type. Signed-off-by: Coly Li <coly.li@suse.de> Signed-off-by: Helge Deller <deller@gmx.de> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
-rw-r--r--arch/parisc/kernel/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index d4dd05674c62..d97d07f47a55 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -173,7 +173,7 @@ EXPORT_SYMBOL(profile_pc);
/* clock source code */
-static cycle_t read_cr16(void)
+static cycle_t read_cr16(struct clocksource *cs)
{
return get_cycles();
}