From be85f8fcd94d16bb3ee1b5d8e54e49f99d06f9ca Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Wed, 5 Sep 2012 10:15:06 -0300 Subject: [PATCH] --- yaml --- r: 331223 b: refs/heads/master c: b98192cb8e39db5c4ee36101646cb82018e04d3a h: refs/heads/master i: 331221: e32a8b0bd8ee8d9186a189aba7df8bfcf6580b41 331219: a197dbc4c931c0b4c2377fa8a0c585c3be72c9eb 331215: 3775387dadd9762ee2d29172cb2b4771f2cba8cd v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/s5p-fimc/fimc-lite-reg.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9250bce6d0c6..e664498f1505 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4cfae67515ed4c7bf5bb94fde20130153936f465 +refs/heads/master: b98192cb8e39db5c4ee36101646cb82018e04d3a diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-lite-reg.c b/trunk/drivers/media/platform/s5p-fimc/fimc-lite-reg.c index 09dc71e477df..a22d7eb05c82 100644 --- a/trunk/drivers/media/platform/s5p-fimc/fimc-lite-reg.c +++ b/trunk/drivers/media/platform/s5p-fimc/fimc-lite-reg.c @@ -118,9 +118,9 @@ static const u32 src_pixfmt_map[8][3] = { FLITE_REG_CIGCTRL_YUV422_1P }, { V4L2_MBUS_FMT_VYUY8_2X8, FLITE_REG_CISRCSIZE_ORDER422_IN_CRYCBY, FLITE_REG_CIGCTRL_YUV422_1P }, - { V4L2_PIX_FMT_SGRBG8, 0, FLITE_REG_CIGCTRL_RAW8 }, - { V4L2_PIX_FMT_SGRBG10, 0, FLITE_REG_CIGCTRL_RAW10 }, - { V4L2_PIX_FMT_SGRBG12, 0, FLITE_REG_CIGCTRL_RAW12 }, + { V4L2_MBUS_FMT_SGRBG8_1X8, 0, FLITE_REG_CIGCTRL_RAW8 }, + { V4L2_MBUS_FMT_SGRBG10_1X10, 0, FLITE_REG_CIGCTRL_RAW10 }, + { V4L2_MBUS_FMT_SGRBG12_1X12, 0, FLITE_REG_CIGCTRL_RAW12 }, { V4L2_MBUS_FMT_JPEG_1X8, 0, FLITE_REG_CIGCTRL_USER(1) }, };