From 192da16d06e4e6b10868251ebdeb8470f05599bf Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Mon, 11 Oct 2010 15:04:53 +0200 Subject: [PATCH] --- yaml --- r: 212559 b: refs/heads/master c: 0d0e9cbf815a78d62889554826f7d06b323c2d06 h: refs/heads/master i: 212557: 9cca8511f68c9d4c25d19d03c6091689089c1d96 212555: 772e54a9c63acf0e72b90231fb36f9b05fe4b625 212551: 8d5519b2d7dd58118e670a1a9eb2eee2b6fea08b 212543: a929442e4ea7b26f4188eef90022fce12f9d5f04 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx25/clock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ee993b7ded79..9b3b7ddbb534 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 886ab3dae2ba26bde5bab096c931365db9f49830 +refs/heads/master: 0d0e9cbf815a78d62889554826f7d06b323c2d06 diff --git a/trunk/arch/arm/mach-mx25/clock.c b/trunk/arch/arm/mach-mx25/clock.c index 25f37a9a0422..2179713873c2 100644 --- a/trunk/arch/arm/mach-mx25/clock.c +++ b/trunk/arch/arm/mach-mx25/clock.c @@ -299,8 +299,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk) _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) - _REGISTER_CLOCK(NULL, "sdhc", esdhc1_clk) - _REGISTER_CLOCK(NULL, "sdhc", esdhc2_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) + _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk) _REGISTER_CLOCK("mx2-camera.0", NULL, csi_clk) _REGISTER_CLOCK(NULL, "audmux", audmux_clk) _REGISTER_CLOCK("flexcan.0", NULL, can1_clk)