diff --git a/[refs] b/[refs] index 7573fd8e7e3b..03c231eb87ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51412aac67526e82d3b6c6351c0c9f0548656256 +refs/heads/master: 148d0b8deb4348e953e71ed17829e7817cf29e0e diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/trunk/drivers/media/video/gspca/m5602/m5602_s5k4aa.h index 1f88b0d040c4..2f3af9503aa7 100644 --- a/trunk/drivers/media/video/gspca/m5602/m5602_s5k4aa.h +++ b/trunk/drivers/media/video/gspca/m5602/m5602_s5k4aa.h @@ -143,13 +143,13 @@ static struct m5602_sensor s5k4aa = { .nmodes = 1, .modes = { { - M5602_DEFAULT_FRAME_WIDTH, - M5602_DEFAULT_FRAME_HEIGHT, + 640, + 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, .sizeimage = - M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT, - .bytesperline = M5602_DEFAULT_FRAME_WIDTH, + 640 * 480, + .bytesperline = 640, .colorspace = V4L2_COLORSPACE_SRGB, .priv = 1 }