From 675dff6baa3713d854af2864c3db4aef828c461e Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Fri, 4 Nov 2011 10:07:06 -0300
Subject: [PATCH] --- yaml --- r: 276860 b: refs/heads/master c:
 f83f71fda27650ae43558633be93652577dbc38c h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/video/s5p-fimc/fimc-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d1512533fef4..390137604fe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d12392ec006d94e5cf6c98f7ed56ff0c881ec33f
+refs/heads/master: f83f71fda27650ae43558633be93652577dbc38c
diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-core.c b/trunk/drivers/media/video/s5p-fimc/fimc-core.c
index 7c22d78b0569..07c6254faee3 100644
--- a/trunk/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/trunk/drivers/media/video/s5p-fimc/fimc-core.c
@@ -37,7 +37,7 @@ static char *fimc_clocks[MAX_FIMC_CLOCKS] = {
 static struct fimc_fmt fimc_formats[] = {
 	{
 		.name		= "RGB565",
-		.fourcc		= V4L2_PIX_FMT_RGB565X,
+		.fourcc		= V4L2_PIX_FMT_RGB565,
 		.depth		= { 16 },
 		.color		= S5P_FIMC_RGB565,
 		.memplanes	= 1,