Skip to content

L
linux
Commit 2389b360 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb 

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 7686ad56
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/media/video/gspca/sonixb.c
View file @ 2389b360
...@@ -232,7 +232,7 @@ static struct ctrl sd_ctrls[] = { ...@@ -232,7 +232,7 @@ static struct ctrl sd_ctrls[] = {
static struct v4l2_pix_format vga_mode[] = { static struct v4l2_pix_format vga_mode[] = {
{160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
.bytesperline = 160, .bytesperline = 160,
.sizeimage = 160 * 120 * 5 / 4, .sizeimage = 160 * 120,
.colorspace = V4L2_COLORSPACE_SRGB, .colorspace = V4L2_COLORSPACE_SRGB,
.priv = 2 | MODE_RAW}, .priv = 2 | MODE_RAW},
{160, 120, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE, {160, 120, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
...@@ -264,7 +264,7 @@ static struct v4l2_pix_format sif_mode[] = { ...@@ -264,7 +264,7 @@ static struct v4l2_pix_format sif_mode[] = {
.priv = 1 | MODE_REDUCED_SIF}, .priv = 1 | MODE_REDUCED_SIF},
{176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
.bytesperline = 176, .bytesperline = 176,
.sizeimage = 176 * 144 * 5 / 4, .sizeimage = 176 * 144,
.colorspace = V4L2_COLORSPACE_SRGB, .colorspace = V4L2_COLORSPACE_SRGB,
.priv = 1 | MODE_RAW}, .priv = 1 | MODE_RAW},
{176, 144, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE, {176, 144, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7