Merge branch 'sh/clkfwk'

This commit is contained in:
Paul Mundt 2009-05-26 23:50:40 +09:00
commit 464c9e1037
53 changed files with 1213 additions and 893 deletions

View file

@ -396,7 +396,7 @@ static int __devinit calc_CCR(unsigned long scl_hz)
signed char cdf, cdfm;
int scgd, scgdm, scgds;
mclk = clk_get(NULL, "module_clk");
mclk = clk_get(NULL, "peripheral_clk");
if (IS_ERR(mclk)) {
return PTR_ERR(mclk);
} else {