diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-26 17:41:35 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-26 17:41:35 -0400 |
| commit | 88b6f7eb9b4a06fbfe27f2d98e249577f4cfdaef (patch) | |
| tree | 9ef0d7ecd3e0551ca4d13ac0134aeb3ecd8558c7 /arch/arm/mach-omap2/clock24xx.c | |
| parent | 8f9ccfeeb2cecb54dd093119291ab271ab0fd94a (diff) | |
| parent | 7971687094ef48695aa56a0c03416b609bd4d1fd (diff) | |
Merge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into for-next
Diffstat (limited to 'arch/arm/mach-omap2/clock24xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock24xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index c442fe9f998a..44de0271fc2f 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
| @@ -725,7 +725,7 @@ int __init omap2_clk_init(void) | |||
| 725 | clk_init(&omap2_clk_functions); | 725 | clk_init(&omap2_clk_functions); |
| 726 | 726 | ||
| 727 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) | 727 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) |
| 728 | clk_init_one(c->lk.clk); | 728 | clk_preinit(c->lk.clk); |
| 729 | 729 | ||
| 730 | osc_ck.rate = omap2_osc_clk_recalc(&osc_ck); | 730 | osc_ck.rate = omap2_osc_clk_recalc(&osc_ck); |
| 731 | propagate_rate(&osc_ck); | 731 | propagate_rate(&osc_ck); |