diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
| commit | 14b6848bc0134b8838d374c423df3edda9b1490e (patch) | |
| tree | 724dc912efe84f432d33a798502811c5f5295774 /drivers/mmc/host/omap_hsmmc.c | |
| parent | 05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 (diff) | |
| parent | 4da3782151300237db3abe070f716922889252e0 (diff) | |
Merge branch 'omap-clks3' into devel
Conflicts:
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'drivers/mmc/host/omap_hsmmc.c')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index a631c81dce12..3916a5618e28 100644 --- 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) | |||
| 956 | 956 | ||
| 957 | sema_init(&host->sem, 1); | 957 | sema_init(&host->sem, 1); |
| 958 | 958 | ||
| 959 | host->iclk = clk_get(&pdev->dev, "mmchs_ick"); | 959 | host->iclk = clk_get(&pdev->dev, "ick"); |
| 960 | if (IS_ERR(host->iclk)) { | 960 | if (IS_ERR(host->iclk)) { |
| 961 | ret = PTR_ERR(host->iclk); | 961 | ret = PTR_ERR(host->iclk); |
| 962 | host->iclk = NULL; | 962 | host->iclk = NULL; |
| 963 | goto err1; | 963 | goto err1; |
| 964 | } | 964 | } |
| 965 | host->fclk = clk_get(&pdev->dev, "mmchs_fck"); | 965 | host->fclk = clk_get(&pdev->dev, "fck"); |
| 966 | if (IS_ERR(host->fclk)) { | 966 | if (IS_ERR(host->fclk)) { |
| 967 | ret = PTR_ERR(host->fclk); | 967 | ret = PTR_ERR(host->fclk); |
| 968 | host->fclk = NULL; | 968 | host->fclk = NULL; |