1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
index ebd5c4338eb..10550bd93b0 100644
--- a/drivers/media/video/davinci/vpif.h
+++ b/drivers/media/video/davinci/vpif.h
@@ -577,12 +577,10 @@ struct vpif_channel_config_params {
         char name[VPIF_MAX_NAME];       /* Name of the mode */
         u16 width;                      /* Indicates width of the image */
         u16 height;                     /* Indicates height of the image */
-        u8 fps;
-        u8 frm_fmt;                     /* Indicates whether this is interlaced
-                                         * or progressive format */
-        u8 ycmux_mode;                  /* Indicates whether this mode requires
-                                         * single or two channels */
-        u16 eav2sav;                    /* length of sav 2 eav */
+        u8 frm_fmt;                     /* Interlaced (0) or progressive (1) */
+        u8 ycmux_mode;                  /* This mode requires one (0) or two (1)
+                                           channels */
+        u16 eav2sav;                    /* length of eav 2 sav */
         u16 sav2eav;                    /* length of sav 2 eav */
         u16 l1, l3, l5, l7, l9, l11;    /* Other parameter configurations */
         u16 vsize;                      /* Vertical size of the image */
@@ -590,10 +588,14 @@ struct vpif_channel_config_params {
                                          * is in BT or in CCD/CMOS */
         u8  vbi_supported;              /* Indicates whether this mode
                                          * supports capturing vbi or not */
-        u8 hd_sd;
-        v4l2_std_id stdid;
+        u8 hd_sd;                       /* HDTV (1) or SDTV (0) format */
+        v4l2_std_id stdid;              /* SDTV format */
+        u32 dv_preset;                  /* HDTV format */
 };
 
+extern const unsigned int vpif_ch_params_count;
+extern const struct vpif_channel_config_params ch_params[];
+
 struct vpif_video_params;
 struct vpif_params;
 struct vpif_vbi_params;