Merge branch 'clks' into devel

This commit is contained in:
Russell King 2008-11-30 17:46:52 +00:00 • committed by Russell King
commit 112243034c
13 changed files with 65 additions and 271 deletions

View file

@ -500,7 +500,7 @@ static int mmci_probe(struct amba_device *dev, void *id)
}
host = mmc_priv(mmc);
host->clk = clk_get(&dev->dev, "MCLK");
host->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(host->clk)) {
ret = PTR_ERR(host->clk);
host->clk = NULL;