From 88a71eab8f456655725bfb75a37dbe6976fd7e68 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Tue, 16 Apr 2013 03:02:20 -0300
Subject: [PATCH] --- yaml --- r: 367088 b: refs/heads/master c:
 068b16b638070611272cf60da821cd70b2a267b3 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/platform/exynos4-is/fimc-core.h | 2 +-
 trunk/drivers/media/platform/exynos4-is/fimc-lite.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1ff6909fe401..12968a9592ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38c602b8ed4ddb73c9274df1af33a6f6f7db26e1
+refs/heads/master: 068b16b638070611272cf60da821cd70b2a267b3
diff --git a/trunk/drivers/media/platform/exynos4-is/fimc-core.h b/trunk/drivers/media/platform/exynos4-is/fimc-core.h
index d2fe162485a3..953b074d542f 100644
--- a/trunk/drivers/media/platform/exynos4-is/fimc-core.h
+++ b/trunk/drivers/media/platform/exynos4-is/fimc-core.h
@@ -425,7 +425,7 @@ struct fimc_dev {
 	struct regmap			*sysreg;
 	const struct fimc_variant	*variant;
 	const struct fimc_drvdata	*drv_data;
-	u16				id;
+	int				id;
 	struct clk			*clock[MAX_FIMC_CLOCKS];
 	void __iomem			*regs;
 	wait_queue_head_t		irq_queue;
diff --git a/trunk/drivers/media/platform/exynos4-is/fimc-lite.h b/trunk/drivers/media/platform/exynos4-is/fimc-lite.h
index 71fed5129e30..47da5e049247 100644
--- a/trunk/drivers/media/platform/exynos4-is/fimc-lite.h
+++ b/trunk/drivers/media/platform/exynos4-is/fimc-lite.h
@@ -140,7 +140,7 @@ struct fimc_lite {
 	struct v4l2_subdev	*sensor;
 	struct v4l2_ctrl_handler ctrl_handler;
 	struct v4l2_ctrl	*test_pattern;
-	u32			index;
+	int			index;
 	struct fimc_pipeline	pipeline;
 	const struct fimc_pipeline_ops *pipeline_ops;