Merge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into for-next

This commit is contained in:
Tony Lindgren
2009-05-26 14:41:35 -07:00
10 changed files with 128 additions and 86 deletions

View File

@ -725,7 +725,7 @@ int __init omap2_clk_init(void)
clk_init(&omap2_clk_functions);
for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++)
clk_init_one(c->lk.clk);
clk_preinit(c->lk.clk);
osc_ck.rate = omap2_osc_clk_recalc(&osc_ck);
propagate_rate(&osc_ck);