diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 11:18:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 11:18:20 -0400 |
| commit | bf2937695fe2330bfd8933a2310e7bdd2581dc2e (patch) | |
| tree | 66286a4ae2bf4d5c317e7270b92effa570e7f1d7 /drivers | |
| parent | 1a5f20fe197f814fc0b29173894a706f478db821 (diff) | |
| parent | 5967d33ce8a030f01a716fc0b25fcb03744a5fda (diff) | |
Merge branch 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
clocksource: sh_cmt: Fix up bogus shift value.
arch/sh/mm: Eliminate a double lock
sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().
sh: remove duplicated #include
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/sh_cmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index f3d3898898ed..717305d30444 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c | |||
| @@ -449,7 +449,7 @@ static int sh_cmt_register_clocksource(struct sh_cmt_priv *p, | |||
| 449 | clk_disable(p->clk); | 449 | clk_disable(p->clk); |
| 450 | 450 | ||
| 451 | /* TODO: calculate good shift from rate and counter bit width */ | 451 | /* TODO: calculate good shift from rate and counter bit width */ |
| 452 | cs->shift = 10; | 452 | cs->shift = 0; |
| 453 | cs->mult = clocksource_hz2mult(p->rate, cs->shift); | 453 | cs->mult = clocksource_hz2mult(p->rate, cs->shift); |
| 454 | 454 | ||
| 455 | dev_info(&p->pdev->dev, "used as clock source\n"); | 455 | dev_info(&p->pdev->dev, "used as clock source\n"); |