diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
| commit | 418f19ea17a99421b22a64e101e14b6a16bed66d (patch) | |
| tree | 7c21fcc368c63f1f9907deac6d16b30bd371792d /drivers/mmc/host/mmci.c | |
| parent | 98444d3dd975653a4a970ecc0dfc30918da92f60 (diff) | |
| parent | f6e10b865c3ea56bdaa8c6ecfee313b997900dbb (diff) | |
Merge branch 'master' of ../mmc
Diffstat (limited to 'drivers/mmc/host/mmci.c')
| -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; |