diff options
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/v4l2-subdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 38b89cf7c995..b4e48dc3f2ba 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h | |||
@@ -113,6 +113,7 @@ struct v4l2_subdev_core_ops { | |||
113 | int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls); | 113 | int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls); |
114 | int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls); | 114 | int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls); |
115 | int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm); | 115 | int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm); |
116 | int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm); | ||
116 | long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); | 117 | long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); |
117 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 118 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
118 | int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg); | 119 | int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg); |
@@ -137,7 +138,6 @@ struct v4l2_subdev_tuner_ops { | |||
137 | int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq); | 138 | int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq); |
138 | int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt); | 139 | int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt); |
139 | int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt); | 140 | int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt); |
140 | int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm); | ||
141 | int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type); | 141 | int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type); |
142 | int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config); | 142 | int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config); |
143 | int (*s_standby)(struct v4l2_subdev *sd); | 143 | int (*s_standby)(struct v4l2_subdev *sd); |