[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Andy Green]

The following commit has been merged in the andy-tracking branch:
commit 705dd60511374f351b15a6af203a612d56572f91
Author: Werner Almesberger <werner at openmoko.org>
Date:   Wed Mar 11 11:25:17 2009 +0000

    Rename CAMERA clock
    
    Identifiers related to the "camera" clock were mis-named as camif.
    This patch renames them.
    
    Signed-off-by: Werner Almesberger <werner at openmoko.org>

diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c
index b6b9de5..7602cf8 100644
--- a/arch/arm/plat-s3c64xx/s3c6400-clock.c
+++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c
@@ -595,16 +595,16 @@ static struct clksrc_clk clk_irda = {
 	.reg_divider	= S3C_CLK_DIV2,
 };
 
-static struct clk *clkset_camif_list[] = {
+static struct clk *clkset_camera_list[] = {
 	&clk_h2,
 };
 
-static struct clk_sources clkset_camif = {
-	.sources	= clkset_camif_list,
-	.nr_sources	= ARRAY_SIZE(clkset_camif_list),
+static struct clk_sources clkset_camera = {
+	.sources	= clkset_camera_list,
+	.nr_sources	= ARRAY_SIZE(clkset_camera_list),
 };
 
-static struct clksrc_clk clk_camif = {
+static struct clksrc_clk clk_camera = {
 	.clk	= {
 		.name		= "camera",
 		.id		= -1,
@@ -617,7 +617,7 @@ static struct clksrc_clk clk_camif = {
 	},
 	.shift		= 0,
 	.mask		= 0,
-	.sources	= &clkset_camif,
+	.sources	= &clkset_camera,
 	.divider_shift	= S3C6400_CLKDIV0_CAM_SHIFT,
 	.reg_divider	= S3C_CLK_DIV0,
 };
@@ -739,7 +739,7 @@ static struct clk *clks[] __initdata = {
 	&clk_audio0.clk,
 	&clk_audio1.clk,
 	&clk_irda.clk,
-	&clk_camif.clk,
+	&clk_camera.clk,
 	&clk_arm,
 };
 

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko