aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/davinci/vpif_capture.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-18 06:18:47 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-26 16:00:02 -0400
commit0598c17b784a324c1759e44a3260c476b04f4725 (patch)
tree11cec482be9e220fa66a57419391dcf1b8794f46 /drivers/media/platform/davinci/vpif_capture.h
parente34db0661dc7945e5412a568f38dd170c78099d1 (diff)
[media] vpif: replace preset with the timings API
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/davinci/vpif_capture.h')
-rw-r--r--drivers/media/platform/davinci/vpif_capture.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/davinci/vpif_capture.h
index 3511510f43ee..aa6d3daffda8 100644
--- a/drivers/media/platform/davinci/vpif_capture.h
+++ b/drivers/media/platform/davinci/vpif_capture.h
@@ -54,8 +54,7 @@ struct video_obj {
54 enum v4l2_field buf_field; 54 enum v4l2_field buf_field;
55 /* Currently selected or default standard */ 55 /* Currently selected or default standard */
56 v4l2_std_id stdid; 56 v4l2_std_id stdid;
57 u32 dv_preset; 57 struct v4l2_dv_timings dv_timings;
58 struct v4l2_bt_timings bt_timings;
59 /* This is to track the last input that is passed to application */ 58 /* This is to track the last input that is passed to application */
60 u32 input_idx; 59 u32 input_idx;
61}; 60};