2 files changed, 11 insertions, 0 deletions

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 8b4745c5e975..a62673dad76e 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -822,6 +822,11 @@ enum v4l2_mpeg_stream_type {
 #define V4L2_CID_MPEG_STREAM_PID_PCR            (V4L2_CID_MPEG_BASE+4)
 #define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO       (V4L2_CID_MPEG_BASE+5)
 #define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO       (V4L2_CID_MPEG_BASE+6)
+#define V4L2_CID_MPEG_STREAM_VBI_FMT            (V4L2_CID_MPEG_BASE+7)
+enum v4l2_mpeg_stream_vbi_fmt {
+        V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
+        V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
+};
 
 /*  MPEG audio */
 #define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ       (V4L2_CID_MPEG_BASE+100)
diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h
index 51fb06b4c394..074c4008ad52 100644
--- a/include/media/cx2341x.h
+++ b/include/media/cx2341x.h
@@ -25,8 +25,13 @@ enum cx2341x_port {
         CX2341X_PORT_SERIAL    = 2
 };
 
+enum cx2341x_cap {
+        CX2341X_CAP_HAS_SLICED_VBI = 1 << 0,
+};
+
 struct cx2341x_mpeg_params {
         /* misc */
+        u32 capabilities;
         enum cx2341x_port port;
         u16 width;
         u16 height;
@@ -34,6 +39,7 @@ struct cx2341x_mpeg_params {
 
         /* stream */
         enum v4l2_mpeg_stream_type stream_type;
+        enum v4l2_mpeg_stream_vbi_fmt stream_vbi_fmt;
 
         /* audio */
         enum v4l2_mpeg_audio_sampling_freq audio_sampling_freq;