From: Sergio Aguirre <saaguirre@xxxxxx> OMAP3PM: Change CSI2 clock name This patch sets the name of the clock to csi2_96m_fck, to be in sync with the name of the same clock in Paul Walmsley's clock framework. Signed-off-by: Sergio Aguirre <saaguirre@xxxxxx> --- arch/arm/mach-omap2/clock_34xx.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: omapkernel/arch/arm/mach-omap2/clock_34xx.h =================================================================== --- omapkernel.orig/arch/arm/mach-omap2/clock_34xx.h 2008-10-14 18:48:29.000000000 -0500 +++ omapkernel/arch/arm/mach-omap2/clock_34xx.h 2008-10-14 18:52:32.000000000 -0500 @@ -937,8 +937,8 @@ .recalc = &omap3_clk_recalc, }; -static struct clk csi2_fck = { - .name = "csi2_fck", +static struct clk csi2_96m_fck = { + .name = "csi2_96m_fck", .prcmid = PRCM_CSI2, .parent = &func_96m_ck, .flags = CLOCK_IN_OMAP343X | F_CLK | POWER_ON_REQUIRED, @@ -1490,7 +1490,7 @@ &dss_ick, &cam_mclk, &cam_ick, - &csi2_fck, + &csi2_96m_fck, &gpt1_fck, &gpt1_ick, &sync_32k_fck, -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html