diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-10 16:34:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-10 16:34:10 -0800 |
| commit | 23bcbf1b63350ed529f7dfb8a5c459e6e0c1a3ca (patch) | |
| tree | da1b9a4fa3b31895d196d44a3b172af024aaa0af /arch/sparc/kernel | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
| parent | 595a251c0740785fd3c0d2156d78578c7479811e (diff) | |
| download | op-kernel-dev-23bcbf1b63350ed529f7dfb8a5c459e6e0c1a3ca.zip op-kernel-dev-23bcbf1b63350ed529f7dfb8a5c459e6e0c1a3ca.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/leon_kernel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c index 2d51527..f01c426 100644 --- a/arch/sparc/kernel/leon_kernel.c +++ b/arch/sparc/kernel/leon_kernel.c @@ -114,7 +114,7 @@ void __init leon_init_timers(irq_handler_t counter_fn) if (leon3_gptimer_regs && leon3_irqctrl_regs) { LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0); LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld, - (((1000000 / 100) - 1))); + (((1000000 / HZ) - 1))); LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0); #ifdef CONFIG_SMP @@ -128,7 +128,7 @@ void __init leon_init_timers(irq_handler_t counter_fn) } LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].val, 0); - LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/100) - 1))); + LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/HZ) - 1))); LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].ctrl, 0); # endif |
