Merge tag 'firmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / include / media / v4l2-ioctl.h

diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index a4175cda4fc1bba0edf34d90651c01b21945b84a..931652f0e2af9e20a7d79053cbd718e8aeceaddc 100644 (file)
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -243,6 +243,9 @@ struct v4l2_ioctl_ops {
                                        struct v4l2_dbg_register *reg);
        int (*vidioc_s_register)       (struct file *file, void *fh,
                                        const struct v4l2_dbg_register *reg);
+
+       int (*vidioc_g_chip_info)      (struct file *file, void *fh,
+                                       struct v4l2_dbg_chip_info *chip);
 #endif
        int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
                                        struct v4l2_dbg_chip_ident *chip);
@@ -254,15 +257,6 @@ struct v4l2_ioctl_ops {
                                           struct v4l2_frmivalenum *fival);
 
        /* DV Timings IOCTLs */
-       int (*vidioc_enum_dv_presets) (struct file *file, void *fh,
-                                      struct v4l2_dv_enum_preset *preset);
-
-       int (*vidioc_s_dv_preset) (struct file *file, void *fh,
-                                  struct v4l2_dv_preset *preset);
-       int (*vidioc_g_dv_preset) (struct file *file, void *fh,
-                                  struct v4l2_dv_preset *preset);
-       int (*vidioc_query_dv_preset) (struct file *file, void *fh,
-                                       struct v4l2_dv_preset *qpreset);
        int (*vidioc_s_dv_timings) (struct file *file, void *fh,
                                    struct v4l2_dv_timings *timings);
        int (*vidioc_g_dv_timings) (struct file *file, void *fh,
@@ -281,7 +275,7 @@ struct v4l2_ioctl_ops {
 
        /* For other private ioctls */
        long (*vidioc_default)         (struct file *file, void *fh,
-                                       bool valid_prio, int cmd, void *arg);
+                                       bool valid_prio, unsigned int cmd, void *arg);
 };