diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-22 21:22:21 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-22 21:22:21 -0200 |
| commit | 5ef3de8a1593898691935e7014f31edefa49c60d (patch) | |
| tree | 71afcad823cbd6009596aae8c59a47b30b3cc654 /linux/include | |
| parent | 508d4c2d232f61a3ffc92c05bee7a9afe7559081 (diff) | |
| parent | ff63d4ba6fa540c90a770d99026921965ab56c80 (diff) | |
| download | mediapointer-dvb-s2-5ef3de8a1593898691935e7014f31edefa49c60d.tar.gz mediapointer-dvb-s2-5ef3de8a1593898691935e7014f31edefa49c60d.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-subdev
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/v4l2-subdev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-subdev.h b/linux/include/media/v4l2-subdev.h index bc9e0fbf2..ceef016bb 100644 --- a/linux/include/media/v4l2-subdev.h +++ b/linux/include/media/v4l2-subdev.h @@ -79,7 +79,7 @@ struct v4l2_subdev_core_ops { int (*g_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); int (*s_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm); - int (*ioctl)(struct v4l2_subdev *sd, int cmd, void *arg); + int (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); #ifdef CONFIG_VIDEO_ADV_DEBUG int (*g_register)(struct v4l2_subdev *sd, struct v4l2_register *reg); int (*s_register)(struct v4l2_subdev *sd, struct v4l2_register *reg); @@ -110,6 +110,7 @@ struct v4l2_subdev_video_ops { int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line); int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data); int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data); + int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_cap *cap); int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std); int (*s_stream)(struct v4l2_subdev *sd, int enable); int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt); |