summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/davinci/vpif_capture.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-18 12:18:47 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-26 22:00:02 +0200
commit0598c17b784a324c1759e44a3260c476b04f4725 (patch)
tree11cec482be9e220fa66a57419391dcf1b8794f46 /drivers/media/platform/davinci/vpif_capture.h
parent[media] media: coda: set up buffers to be sized as negotiated with s_fmt (diff)
downloadlinux-0598c17b784a324c1759e44a3260c476b04f4725.tar.xz
linux-0598c17b784a324c1759e44a3260c476b04f4725.zip
[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 {
enum v4l2_field buf_field;
/* Currently selected or default standard */
v4l2_std_id stdid;
- u32 dv_preset;
- struct v4l2_bt_timings bt_timings;
+ struct v4l2_dv_timings dv_timings;
/* This is to track the last input that is passed to application */
u32 input_idx;
};