aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/via-camera.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/via-camera.c')
-rw-r--r--drivers/media/platform/via-camera.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c
index ae6870cb8339..2616483fce0b 100644
--- a/drivers/media/platform/via-camera.c
+++ b/drivers/media/platform/via-camera.c
@@ -101,7 +101,7 @@ struct via_camera {
101 */ 101 */
102 struct v4l2_pix_format sensor_format; 102 struct v4l2_pix_format sensor_format;
103 struct v4l2_pix_format user_format; 103 struct v4l2_pix_format user_format;
104 enum v4l2_mbus_pixelcode mbus_code; 104 u32 mbus_code;
105}; 105};
106 106
107/* 107/*
@@ -143,12 +143,12 @@ static struct via_format {
143 __u8 *desc; 143 __u8 *desc;
144 __u32 pixelformat; 144 __u32 pixelformat;
145 int bpp; /* Bytes per pixel */ 145 int bpp; /* Bytes per pixel */
146 enum v4l2_mbus_pixelcode mbus_code; 146 u32 mbus_code;
147} via_formats[] = { 147} via_formats[] = {
148 { 148 {
149 .desc = "YUYV 4:2:2", 149 .desc = "YUYV 4:2:2",
150 .pixelformat = V4L2_PIX_FMT_YUYV, 150 .pixelformat = V4L2_PIX_FMT_YUYV,
151 .mbus_code = V4L2_MBUS_FMT_YUYV8_2X8, 151 .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8,
152 .bpp = 2, 152 .bpp = 2,
153 }, 153 },
154 /* RGB444 and Bayer should be doable, but have never been 154 /* RGB444 and Bayer should be doable, but have never been
@@ -849,7 +849,7 @@ static const struct v4l2_pix_format viacam_def_pix_format = {
849 .sizeimage = VGA_WIDTH * VGA_HEIGHT * 2, 849 .sizeimage = VGA_WIDTH * VGA_HEIGHT * 2,
850}; 850};
851 851
852static const enum v4l2_mbus_pixelcode via_def_mbus_code = V4L2_MBUS_FMT_YUYV8_2X8; 852static const u32 via_def_mbus_code = MEDIA_BUS_FMT_YUYV8_2X8;
853 853
854static int viacam_enum_fmt_vid_cap(struct file *filp, void *priv, 854static int viacam_enum_fmt_vid_cap(struct file *filp, void *priv,
855 struct v4l2_fmtdesc *fmt) 855 struct v4l2_fmtdesc *fmt)