diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-07 06:22:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-07 06:22:15 -0400 |
| commit | 5f4457a4f62cc9d78e04c0eb12ff0540899aad89 (patch) | |
| tree | 0b973d527ea6b2ae31e08da0746b4965a3c5a6d8 /arch/arm/mach-mmp/time.c | |
| parent | 9b94b3a19b13e094c10f65f24bc358f6ffe4eacd (diff) | |
| parent | b87297fb405ef13cac375f202d114323b076a56d (diff) | |
Merge branch 'linus' into x86/cpu
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 = { | |||
| 136 | .set_mode = timer_set_mode, | 136 | .set_mode = timer_set_mode, |
| 137 | }; | 137 | }; |
| 138 | 138 | ||
| 139 | static cycle_t clksrc_read(void) | 139 | static cycle_t clksrc_read(struct clocksource *cs) |
| 140 | { | 140 | { |
| 141 | return timer_read(); | 141 | return timer_read(); |
| 142 | } | 142 | } |