---

yaml --- r: 367088 b: refs/heads/master c: 068b16b h: refs/heads/master v: v3
git-mirror · Apr 25, 2013 · 88a71ea · 88a71ea
1 parent 22daa6a
commit 88a71ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;