diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-30 12:46:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-30 12:46:52 -0500 |
| commit | 112243034cec7c3ef0499fdebf39218714da453d (patch) | |
| tree | f6469eaab26ea2e985da32b5cc297ddb9c64f952 /drivers/mmc | |
| parent | 773e9610a7bd44720b8b625d01997b2953edc2db (diff) | |
| parent | ee569c43e340202fb0ba427c57b77568a32b9a3a (diff) | |
Merge branch 'clks' into devel
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 2fadf323c696..1bcbdd6763ac 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
| @@ -500,7 +500,7 @@ static int mmci_probe(struct amba_device *dev, void *id) | |||
| 500 | } | 500 | } |
| 501 | 501 | ||
| 502 | host = mmc_priv(mmc); | 502 | host = mmc_priv(mmc); |
| 503 | host->clk = clk_get(&dev->dev, "MCLK"); | 503 | host->clk = clk_get(&dev->dev, NULL); |
| 504 | if (IS_ERR(host->clk)) { | 504 | if (IS_ERR(host->clk)) { |
| 505 | ret = PTR_ERR(host->clk); | 505 | ret = PTR_ERR(host->clk); |
| 506 | host->clk = NULL; | 506 | host->clk = NULL; |