From 7311fc2f2ae6705aececb2ffe66122185529d391 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 6 Mar 2012 10:35:53 -0300 Subject: [PATCH] --- yaml --- r: 298672 b: refs/heads/master c: bfb5f5530c8b3efd3f5e58ab14258bf2a9b34096 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/clock-imx35.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f1c34266caac..6e4bd2cbd3c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0df87541888fe3408fa71132d2b35c575586f89 +refs/heads/master: bfb5f5530c8b3efd3f5e58ab14258bf2a9b34096 diff --git a/trunk/arch/arm/mach-imx/clock-imx35.c b/trunk/arch/arm/mach-imx/clock-imx35.c index 1e279af656ad..e56c1a83eee3 100644 --- a/trunk/arch/arm/mach-imx/clock-imx35.c +++ b/trunk/arch/arm/mach-imx/clock-imx35.c @@ -483,7 +483,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk) _REGISTER_CLOCK(NULL, "max", max_clk) _REGISTER_CLOCK(NULL, "audmux", audmux_clk) - _REGISTER_CLOCK(NULL, "csi", csi_clk) + _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) _REGISTER_CLOCK(NULL, "iim", iim_clk) _REGISTER_CLOCK(NULL, "gpu2d", gpu2d_clk) _REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)