Merge branch 'samsung/cleanup' into next/drivers

Dependency for the samsung/drivers branch

Conflicts:
	arch/arm/mach-exynos/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index cb60c4197e0a..6b3f3664edeb 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -435,14 +435,11 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
 
         for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
                 struct clk *clk;
-                char *name = pdata->clocks[ptr];
-
-                if (name == NULL)
-                        continue;
+                char name[14];
 
+                snprintf(name, 14, "mmc_busclk.%d", ptr);
                 clk = clk_get(dev, name);
                 if (IS_ERR(clk)) {
-                        dev_err(dev, "failed to get clock %s\n", name);
                         continue;
                 }