diff options
author | Nicolas Pitre <nico@cam.org> | 2006-12-22 12:36:30 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-12-30 12:05:06 -0500 |
commit | 35108fb9b3f291b594a8019cb9188da6be2f7990 (patch) | |
tree | 3948ff01a0f0efb5e0c4b843d1222b2c348a1dc6 /arch/arm/mach-pxa/time.c | |
parent | 2ca2c570b0e38b0c214426b1708ee1b0c3a5067d (diff) |
[ARM] 4064/1: make pxa_get_cycles() static
... and fix a comment as well.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/time.c')
-rw-r--r-- | arch/arm/mach-pxa/time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index 3775b8f38429..ee2beb400414 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -101,7 +101,7 @@ static struct irqaction pxa_timer_irq = { | |||
101 | .handler = pxa_timer_interrupt, | 101 | .handler = pxa_timer_interrupt, |
102 | }; | 102 | }; |
103 | 103 | ||
104 | cycle_t pxa_get_cycles(void) | 104 | static cycle_t pxa_get_cycles(void) |
105 | { | 105 | { |
106 | return OSCR; | 106 | return OSCR; |
107 | } | 107 | } |
@@ -134,13 +134,13 @@ static void __init pxa_timer_init(void) | |||
134 | OSMR0 = OSCR + LATCH; /* set initial match */ | 134 | OSMR0 = OSCR + LATCH; /* set initial match */ |
135 | local_irq_restore(flags); | 135 | local_irq_restore(flags); |
136 | 136 | ||
137 | /* on PXA OSCR runs continiously and is not written to, so we can use it | 137 | /* |
138 | * as clock source directly. | 138 | * OSCR runs continuously on PXA and is not written to, |
139 | * so we can use it as clock source directly. | ||
139 | */ | 140 | */ |
140 | clocksource_pxa.mult = | 141 | clocksource_pxa.mult = |
141 | clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_pxa.shift); | 142 | clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_pxa.shift); |
142 | clocksource_register(&clocksource_pxa); | 143 | clocksource_register(&clocksource_pxa); |
143 | |||
144 | } | 144 | } |
145 | 145 | ||
146 | #ifdef CONFIG_NO_IDLE_HZ | 146 | #ifdef CONFIG_NO_IDLE_HZ |