diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 11:16:05 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 11:16:05 +0100 |
| commit | 355532bdda14a7162cee55fdd67600bf9bc9a152 (patch) | |
| tree | 96c6e79c22ba65a47685097460b8e0168a2ff431 /arch/arm/mach-mmp/time.c | |
| parent | 2528ed119b8f4fc553f9d1e65719ae183ffa97f4 (diff) | |
| parent | 6ec04f434d29aed33608e0ca4d8b100190e71e96 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-mmp/time.c')
| -rw-r--r-- | arch/arm/mach-mmp/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index b03a6eda7419..a8400bb891e7 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -136,7 +136,7 @@ static struct clock_event_device ckevt = { .set_mode = timer_set_mode, }; -static cycle_t clksrc_read(void) +static cycle_t clksrc_read(struct clocksource *cs) { return timer_read(); } |