diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-30 18:46:52 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-30 18:46:52 +0100 |
commit | 112243034cec7c3ef0499fdebf39218714da453d (patch) | |
tree | f6469eaab26ea2e985da32b5cc297ddb9c64f952 /drivers/mmc/host/mmci.c | |
parent | [ARM] Update mach-types (diff) | |
parent | [ARM] amba drivers: don't pass a consumer clock name for devices with unique ... (diff) | |
download | linux-112243034cec7c3ef0499fdebf39218714da453d.tar.xz linux-112243034cec7c3ef0499fdebf39218714da453d.zip |
Merge branch 'clks' into devel
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) } 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; |