Merge branch 'linux-2.6' into for-2.6.22

1 files changed, 10 insertions, 0 deletions

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 1dd3d3239ecf..d62847f846c2 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -127,6 +127,8 @@ struct video_device
                                             struct v4l2_fmtdesc *f);
         int (*vidioc_enum_fmt_video_output)(struct file *file, void *fh,
                                             struct v4l2_fmtdesc *f);
+        int (*vidioc_enum_fmt_output_overlay) (struct file *file, void *fh,
+                                            struct v4l2_fmtdesc *f);
         int (*vidioc_enum_fmt_vbi_output)  (struct file *file, void *fh,
                                             struct v4l2_fmtdesc *f);
         int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
@@ -145,6 +147,8 @@ struct video_device
                                         struct v4l2_format *f);
         int (*vidioc_g_fmt_video_output)(struct file *file, void *fh,
                                         struct v4l2_format *f);
+        int (*vidioc_g_fmt_output_overlay) (struct file *file, void *fh,
+                                        struct v4l2_format *f);
         int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,
                                         struct v4l2_format *f);
 
@@ -162,6 +166,8 @@ struct video_device
                                         struct v4l2_format *f);
         int (*vidioc_s_fmt_video_output)(struct file *file, void *fh,
                                         struct v4l2_format *f);
+        int (*vidioc_s_fmt_output_overlay) (struct file *file, void *fh,
+                                        struct v4l2_format *f);
         int (*vidioc_s_fmt_type_private)(struct file *file, void *fh,
                                         struct v4l2_format *f);
 
@@ -178,6 +184,8 @@ struct video_device
                                           struct v4l2_format *f);
         int (*vidioc_try_fmt_video_output)(struct file *file, void *fh,
                                           struct v4l2_format *f);
+        int (*vidioc_try_fmt_output_overlay)(struct file *file, void *fh,
+                                          struct v4l2_format *f);
         int (*vidioc_try_fmt_type_private)(struct file *file, void *fh,
                                           struct v4l2_format *f);
 
@@ -309,6 +317,8 @@ struct video_device
         int (*vidioc_s_register)       (struct file *file, void *fh,
                                         struct v4l2_register *reg);
 #endif
+        int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
+                                        struct v4l2_chip_ident *chip);
 
 
 #ifdef OBSOLETE_OWNER /* to be removed soon */