git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'omap-clks3' into devel
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
omap_hsmmc.c
diff --git
a/drivers/mmc/host/omap_hsmmc.c
b/drivers/mmc/host/omap_hsmmc.c
index
a631c81
..
3916a56
100644
(file)
--- a/
drivers/mmc/host/omap_hsmmc.c
+++ b/
drivers/mmc/host/omap_hsmmc.c
@@
-956,13
+956,13
@@
static int __init omap_mmc_probe(struct platform_device *pdev)
sema_init(&host->sem, 1);
sema_init(&host->sem, 1);
- host->iclk = clk_get(&pdev->dev, "
mmchs_
ick");
+ host->iclk = clk_get(&pdev->dev, "ick");
if (IS_ERR(host->iclk)) {
ret = PTR_ERR(host->iclk);
host->iclk = NULL;
goto err1;
}
if (IS_ERR(host->iclk)) {
ret = PTR_ERR(host->iclk);
host->iclk = NULL;
goto err1;
}
- host->fclk = clk_get(&pdev->dev, "
mmchs_
fck");
+ host->fclk = clk_get(&pdev->dev, "fck");
if (IS_ERR(host->fclk)) {
ret = PTR_ERR(host->fclk);
host->fclk = NULL;
if (IS_ERR(host->fclk)) {
ret = PTR_ERR(host->fclk);
host->fclk = NULL;