From 94fe044a5f2a0ec2a50dcd5625c3d718f5d99cc3 Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Sun, 24 Feb 2013 18:29:21 -0300
Subject: [PATCH] --- yaml --- r: 366959 b: refs/heads/master c:
 8cec74c60be850c33882a0cec16154082a551a26 h: refs/heads/master i:   366957:
 1547eb38804cbddbc9b182a3fbcbadec3ca4ed06   366955:
 47e69494adcd9a73329138e99c005ca3099d1d18   366951:
 5d7e6bc454daa7d2a86e9d9a2ec940e794400155   366943:
 c27ed7de73214e9b84d379621bbc891e37adc222 v: v3

---
 [refs]                                        |  2 +-
 .../media/platform/exynos4-is/fimc-core.c     | 35 -------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/[refs] b/[refs]
index 6a3f10229960..709b92561f49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f998bb7ba9a8f91b76830944fdf7b3e54eebb639
+refs/heads/master: 8cec74c60be850c33882a0cec16154082a551a26
diff --git a/trunk/drivers/media/platform/exynos4-is/fimc-core.c b/trunk/drivers/media/platform/exynos4-is/fimc-core.c
index 6b4a244132fb..90d907e1a5f8 100644
--- a/trunk/drivers/media/platform/exynos4-is/fimc-core.c
+++ b/trunk/drivers/media/platform/exynos4-is/fimc-core.c
@@ -1142,14 +1142,6 @@ static const struct fimc_pix_limit s5p_pix_limit[4] = {
 		.out_rot_en_w	= 1280,
 		.out_rot_dis_w	= 1920,
 	},
-	[3] = {
-		.scaler_en_w	= 1920,
-		.scaler_dis_w	= 8192,
-		.in_rot_en_h	= 1366,
-		.in_rot_dis_w	= 8192,
-		.out_rot_en_w	= 1366,
-		.out_rot_dis_w	= 1920,
-	},
 };
 
 static const struct fimc_variant fimc0_variant_s5p = {
@@ -1204,27 +1196,6 @@ static const struct fimc_variant fimc2_variant_s5pv210 = {
 	.pix_limit	 = &s5p_pix_limit[2],
 };
 
-static const struct fimc_variant fimc0_variant_exynos4210 = {
-	.has_inp_rot	 = 1,
-	.has_out_rot	 = 1,
-	.has_cam_if	 = 1,
-	.has_mainscaler_ext = 1,
-	.min_inp_pixsize = 16,
-	.min_out_pixsize = 16,
-	.hor_offs_align	 = 2,
-	.min_vsize_align = 1,
-	.pix_limit	 = &s5p_pix_limit[1],
-};
-
-static const struct fimc_variant fimc3_variant_exynos4210 = {
-	.has_mainscaler_ext = 1,
-	.min_inp_pixsize = 16,
-	.min_out_pixsize = 16,
-	.hor_offs_align	 = 2,
-	.min_vsize_align = 1,
-	.pix_limit	 = &s5p_pix_limit[3],
-};
-
 /* S5PC100 */
 static const struct fimc_drvdata fimc_drvdata_s5p = {
 	.variant = {
@@ -1252,12 +1223,6 @@ static const struct fimc_drvdata fimc_drvdata_s5pv210 = {
 
 /* EXYNOS4210, S5PV310, S5PC210 */
 static const struct fimc_drvdata fimc_drvdata_exynos4210 = {
-	.variant = {
-		[0] = &fimc0_variant_exynos4210,
-		[1] = &fimc0_variant_exynos4210,
-		[2] = &fimc0_variant_exynos4210,
-		[3] = &fimc3_variant_exynos4210,
-	},
 	.num_entities	= 4,
 	.lclk_frequency = 166000000UL,
 	.dma_pix_hoff	= 1,