diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 20:27:47 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 20:27:47 -0400 |
| commit | 99ce567ba912109c78762246c964327f3f81f27d (patch) | |
| tree | 685265d60792c11d386db6c005ca8b8e714ecc23 /arch/arm/mach-netx/time.c | |
| parent | 8fb2bae4b41eb64f6e233e9bd3f3a789fbb04a06 (diff) | |
| parent | ccc5ff94c66e628d3c501b26ace5d4339667715d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-netx/time.c')
| -rw-r--r-- | arch/arm/mach-netx/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c index f201fddb594f..82801dbf0579 100644 --- a/arch/arm/mach-netx/time.c +++ b/arch/arm/mach-netx/time.c | |||
| @@ -104,7 +104,7 @@ static struct irqaction netx_timer_irq = { | |||
| 104 | .handler = netx_timer_interrupt, | 104 | .handler = netx_timer_interrupt, |
| 105 | }; | 105 | }; |
| 106 | 106 | ||
| 107 | cycle_t netx_get_cycles(void) | 107 | cycle_t netx_get_cycles(struct clocksource *cs) |
| 108 | { | 108 | { |
| 109 | return readl(NETX_GPIO_COUNTER_CURRENT(TIMER_CLOCKSOURCE)); | 109 | return readl(NETX_GPIO_COUNTER_CURRENT(TIMER_CLOCKSOURCE)); |
| 110 | } | 110 | } |