diff --git a/[refs] b/[refs] index a3c3209745be..55b174c69aea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9b2601073aa57ffde7259afbe86f405060058e3 +refs/heads/master: ebc30a0f67a4d6a9470556f4311478b3b04c2b1f diff --git a/trunk/arch/parisc/kernel/time.c b/trunk/arch/parisc/kernel/time.c index d4dd05674c62..d97d07f47a55 100644 --- a/trunk/arch/parisc/kernel/time.c +++ b/trunk/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(); }