diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-29 18:08:11 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-29 18:08:11 +0000 |
| commit | 47992cbdaef2f18a47871b2ed01ad27f568c8b73 (patch) | |
| tree | bfed4f8c7ea3164afc75a85ab3624586c37c37f4 /arch/arm/mach-pxa/time.c | |
| parent | 4655a0de36e8e903e99a8d152818e3aae86dae1a (diff) | |
| parent | 198fc108ee4c2cd3f08954eae6a819c81c03214b (diff) | |
| download | op-kernel-dev-47992cbdaef2f18a47871b2ed01ad27f568c8b73.zip op-kernel-dev-47992cbdaef2f18a47871b2ed01ad27f568c8b73.tar.gz | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/time.c')
| -rw-r--r-- | arch/arm/mach-pxa/time.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index ef4ddf9..0016241 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c @@ -24,7 +24,6 @@ #include <asm/mach/time.h> #include <mach/hardware.h> #include <mach/pxa-regs.h> -#include <asm/mach-types.h> /* * This is PXA's sched_clock implementation. This has a resolution @@ -151,18 +150,11 @@ static struct irqaction pxa_ost0_irq = { static void __init pxa_timer_init(void) { - unsigned long clock_tick_rate; + unsigned long clock_tick_rate = get_clock_tick_rate(); OIER = 0; OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3; - if (cpu_is_pxa25x()) - clock_tick_rate = 3686400; - else if (machine_is_mainstone()) - clock_tick_rate = 3249600; - else - clock_tick_rate = 3250000; - set_oscr2ns_scale(clock_tick_rate); ckevt_pxa_osmr0.mult = |
