Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 15 insertions, 0 deletions

diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 7a4529defa88..e8ba0f2efbae 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -239,6 +239,21 @@ struct v4l2_ioctl_ops {
         int (*vidioc_enum_frameintervals) (struct file *file, void *fh,
                                            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,
+                                    struct v4l2_dv_timings *timings);
+
         /* For other private ioctls */
         long (*vidioc_default)         (struct file *file, void *fh,
                                         int cmd, void *arg);