From a4cafb851f33b2aa1bf8cd3a32758251af7998b1 Mon Sep 17 00:00:00 2001
From: Andrey Gusakov <dron_gus@mail.ru>
Date: Mon, 12 Nov 2012 13:19:23 +0900
Subject: [PATCH] --- yaml --- r: 339844 b: refs/heads/master c:
 9213c50d18a0fbf5865afa3aa0cce33c8a076f76 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/mach-s3c64xx/clock.c | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 41d570a60430..e9fbb22845a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ffb571cb1b9dd103bf8d47f8527cd37163d7e12
+refs/heads/master: 9213c50d18a0fbf5865afa3aa0cce33c8a076f76
diff --git a/trunk/arch/arm/mach-s3c64xx/clock.c b/trunk/arch/arm/mach-s3c64xx/clock.c
index 6562a06b72c5..1a6f85777449 100644
--- a/trunk/arch/arm/mach-s3c64xx/clock.c
+++ b/trunk/arch/arm/mach-s3c64xx/clock.c
@@ -673,15 +673,6 @@ static struct clksrc_sources clkset_audio2 = {
 	.nr_sources	= ARRAY_SIZE(clkset_audio2_list),
 };
 
-static struct clk *clkset_camif_list[] = {
-	&clk_h2,
-};
-
-static struct clksrc_sources clkset_camif = {
-	.sources	= clkset_camif_list,
-	.nr_sources	= ARRAY_SIZE(clkset_camif_list),
-};
-
 static struct clksrc_clk clksrcs[] = {
 	{
 		.clk	= {
@@ -736,10 +727,9 @@ static struct clksrc_clk clksrcs[] = {
 			.name		= "camera",
 			.ctrlbit        = S3C_CLKCON_SCLK_CAM,
 			.enable		= s3c64xx_sclk_ctrl,
+			.parent		= &clk_h2,
 		},
 		.reg_div	= { .reg = S3C_CLK_DIV0, .shift = 20, .size = 4  },
-		.reg_src	= { .reg = NULL, .shift = 0, .size = 0  },
-		.sources	= &clkset_camif,
 	},
 };