summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/kernel/timer.c
diff options
context:
space:
mode:
authorColy Li <coly.li@suse.de>2009-04-22 21:05:31 +0200
committerMichal Simek <monstr@monstr.eu>2009-04-23 16:27:38 +0200
commitf57f2fe2a39338c47b67fbd564a9d3b7587bcbee (patch)
tree19329d51207bf9c55432e39d5e58d0fab3b4c42f /arch/microblaze/kernel/timer.c
parentmicroblaze: Use CFLAGS_KERNEL instead of CFLAGS (diff)
downloadlinux-f57f2fe2a39338c47b67fbd564a9d3b7587bcbee.tar.xz
linux-f57f2fe2a39338c47b67fbd564a9d3b7587bcbee.zip
microblaze: add parameter to microblaze_read()
This patch modifies parameter of microblaze_read() from 'void' to 'struct clocksource *cs', which fixes compile warning for incompatible parameter type. Signed-off-by: Coly Li <coly.li@suse.de> Cc: Michal Simek <monstr@monstr.eu> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel/timer.c')
-rw-r--r--arch/microblaze/kernel/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index 05a497eefd78..bdfa2f9f0c81 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -176,7 +176,7 @@ static __init void microblaze_clockevent_init(void)
clockevents_register_device(&clockevent_microblaze_timer);
}
-static cycle_t microblaze_read(void)
+static cycle_t microblaze_read(struct clocksource *cs)
{
/* reading actual value of timer 1 */
return (cycle_t) (in_be32(TIMER_BASE + TCR1));