From 91fcf44804f3d3e0fe0480055134917c94371599 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 30 Apr 2010 01:19:35 +0200 Subject: [PATCH] --- yaml --- r: 201674 b: refs/heads/master c: 757e1e4d5831c67f308b42babac5a4b6a693a25d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/clock-imx35.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bd05b68dc9de..fce4e7be12be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3f6a34605db2771886b8eaf1cdf8e8ca3e8350d +refs/heads/master: 757e1e4d5831c67f308b42babac5a4b6a693a25d diff --git a/trunk/arch/arm/mach-mx3/clock-imx35.c b/trunk/arch/arm/mach-mx3/clock-imx35.c index 28be011dace6..d3af0fdf8475 100644 --- a/trunk/arch/arm/mach-mx3/clock-imx35.c +++ b/trunk/arch/arm/mach-mx3/clock-imx35.c @@ -428,8 +428,8 @@ static struct clk nfc_clk = { static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "asrc", asrc_clk) _REGISTER_CLOCK(NULL, "ata", ata_clk) - _REGISTER_CLOCK(NULL, "can", can1_clk) - _REGISTER_CLOCK(NULL, "can", can2_clk) + _REGISTER_CLOCK("flexcan.0", NULL, can1_clk) + _REGISTER_CLOCK("flexcan.1", NULL, can2_clk) _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk) _REGISTER_CLOCK("spi_imx.1", NULL, cspi2_clk) _REGISTER_CLOCK(NULL, "ect", ect_clk)