Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
authored by
Mauro Carvalho Chehab
and committed by
Mauro Carvalho Chehab
2389b360
7686ad56
+2
-2
drivers/media/video/gspca/sonixb.c
+2
-2
drivers/media/video/gspca/sonixb.c
···
232
static struct v4l2_pix_format vga_mode[] = {
233
{160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
234
.bytesperline = 160,
235
-
.sizeimage = 160 * 120 * 5 / 4,
236
.colorspace = V4L2_COLORSPACE_SRGB,
237
.priv = 2 | MODE_RAW},
238
{160, 120, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
···
264
.priv = 1 | MODE_REDUCED_SIF},
265
{176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
266
.bytesperline = 176,
267
-
.sizeimage = 176 * 144 * 5 / 4,
268
.colorspace = V4L2_COLORSPACE_SRGB,
269
.priv = 1 | MODE_RAW},
270
{176, 144, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
···
232
static struct v4l2_pix_format vga_mode[] = {
233
{160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
234
.bytesperline = 160,
235
+
.sizeimage = 160 * 120,
236
.colorspace = V4L2_COLORSPACE_SRGB,
237
.priv = 2 | MODE_RAW},
238
{160, 120, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
···
264
.priv = 1 | MODE_REDUCED_SIF},
265
{176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
266
.bytesperline = 176,
267
+
.sizeimage = 176 * 144,
268
.colorspace = V4L2_COLORSPACE_SRGB,
269
.priv = 1 | MODE_RAW},
270
{176, 144, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,