Merge tag 'media/v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-microblaze.git] / drivers / media / pci / zoran / zoran_driver.c

diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index b6a6c4f..c464dae 100644 (file)
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -2792,21 +2792,21 @@ zoran_mmap (struct file           *file,
 }
 
 static const struct v4l2_ioctl_ops zoran_ioctl_ops = {
-       .vidioc_querycap                    = zoran_querycap,
+       .vidioc_querycap                    = zoran_querycap,
        .vidioc_s_selection                 = zoran_s_selection,
        .vidioc_g_selection                 = zoran_g_selection,
-       .vidioc_enum_input                  = zoran_enum_input,
-       .vidioc_g_input                     = zoran_g_input,
-       .vidioc_s_input                     = zoran_s_input,
-       .vidioc_enum_output                 = zoran_enum_output,
-       .vidioc_g_output                    = zoran_g_output,
-       .vidioc_s_output                    = zoran_s_output,
+       .vidioc_enum_input                  = zoran_enum_input,
+       .vidioc_g_input                     = zoran_g_input,
+       .vidioc_s_input                     = zoran_s_input,
+       .vidioc_enum_output                 = zoran_enum_output,
+       .vidioc_g_output                    = zoran_g_output,
+       .vidioc_s_output                    = zoran_s_output,
        .vidioc_g_fbuf                      = zoran_g_fbuf,
        .vidioc_s_fbuf                      = zoran_s_fbuf,
-       .vidioc_g_std                       = zoran_g_std,
-       .vidioc_s_std                       = zoran_s_std,
-       .vidioc_g_jpegcomp                  = zoran_g_jpegcomp,
-       .vidioc_s_jpegcomp                  = zoran_s_jpegcomp,
+       .vidioc_g_std                       = zoran_g_std,
+       .vidioc_s_std                       = zoran_s_std,
+       .vidioc_g_jpegcomp                  = zoran_g_jpegcomp,
+       .vidioc_s_jpegcomp                  = zoran_s_jpegcomp,
        .vidioc_overlay                     = zoran_overlay,
        .vidioc_reqbufs                     = zoran_reqbufs,
        .vidioc_querybuf                    = zoran_querybuf,
@@ -2814,18 +2814,18 @@ static const struct v4l2_ioctl_ops zoran_ioctl_ops = {
        .vidioc_dqbuf                       = zoran_dqbuf,
        .vidioc_streamon                    = zoran_streamon,
        .vidioc_streamoff                   = zoran_streamoff,
-       .vidioc_enum_fmt_vid_cap            = zoran_enum_fmt_vid_cap,
-       .vidioc_enum_fmt_vid_out            = zoran_enum_fmt_vid_out,
-       .vidioc_enum_fmt_vid_overlay        = zoran_enum_fmt_vid_overlay,
-       .vidioc_g_fmt_vid_cap               = zoran_g_fmt_vid_cap,
+       .vidioc_enum_fmt_vid_cap            = zoran_enum_fmt_vid_cap,
+       .vidioc_enum_fmt_vid_out            = zoran_enum_fmt_vid_out,
+       .vidioc_enum_fmt_vid_overlay        = zoran_enum_fmt_vid_overlay,
+       .vidioc_g_fmt_vid_cap               = zoran_g_fmt_vid_cap,
        .vidioc_g_fmt_vid_out               = zoran_g_fmt_vid_out,
        .vidioc_g_fmt_vid_overlay           = zoran_g_fmt_vid_overlay,
-       .vidioc_s_fmt_vid_cap               = zoran_s_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap               = zoran_s_fmt_vid_cap,
        .vidioc_s_fmt_vid_out               = zoran_s_fmt_vid_out,
        .vidioc_s_fmt_vid_overlay           = zoran_s_fmt_vid_overlay,
-       .vidioc_try_fmt_vid_cap             = zoran_try_fmt_vid_cap,
-       .vidioc_try_fmt_vid_out             = zoran_try_fmt_vid_out,
-       .vidioc_try_fmt_vid_overlay         = zoran_try_fmt_vid_overlay,
+       .vidioc_try_fmt_vid_cap             = zoran_try_fmt_vid_cap,
+       .vidioc_try_fmt_vid_out             = zoran_try_fmt_vid_out,
+       .vidioc_try_fmt_vid_overlay         = zoran_try_fmt_vid_overlay,
        .vidioc_subscribe_event             = v4l2_ctrl_subscribe_event,
        .vidioc_unsubscribe_event           = v4l2_event_unsubscribe,
 };