diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-01 02:52:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:22 -0400 |
commit | f41737ece472cd803ffb24ac9f5d6fdd1d871341 (patch) | |
tree | 26ac526ec381e26c46a857f3ce44c84e75331b01 /drivers/media/video/tvp5150.c | |
parent | cc26b076cf8b1040ccc514302ef9a24042272ec3 (diff) |
V4L/DVB (11370): v4l2-subdev: move s_std from tuner to core.
s_std didn't belong in the tuner ops. Stricly speaking it should be part of
the video ops, but it is used by audio and tuner devices as well, so it is
more efficient to make it part of the core ops.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tvp5150.c')
-rw-r--r-- | drivers/media/video/tvp5150.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index d7f3bad2c02f..4aea84a392e8 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
@@ -1025,6 +1025,7 @@ static const struct v4l2_subdev_core_ops tvp5150_core_ops = { | |||
1025 | .g_ctrl = tvp5150_g_ctrl, | 1025 | .g_ctrl = tvp5150_g_ctrl, |
1026 | .s_ctrl = tvp5150_s_ctrl, | 1026 | .s_ctrl = tvp5150_s_ctrl, |
1027 | .queryctrl = tvp5150_queryctrl, | 1027 | .queryctrl = tvp5150_queryctrl, |
1028 | .s_std = tvp5150_s_std, | ||
1028 | .reset = tvp5150_reset, | 1029 | .reset = tvp5150_reset, |
1029 | .g_chip_ident = tvp5150_g_chip_ident, | 1030 | .g_chip_ident = tvp5150_g_chip_ident, |
1030 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1031 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
@@ -1034,7 +1035,6 @@ static const struct v4l2_subdev_core_ops tvp5150_core_ops = { | |||
1034 | }; | 1035 | }; |
1035 | 1036 | ||
1036 | static const struct v4l2_subdev_tuner_ops tvp5150_tuner_ops = { | 1037 | static const struct v4l2_subdev_tuner_ops tvp5150_tuner_ops = { |
1037 | .s_std = tvp5150_s_std, | ||
1038 | .g_tuner = tvp5150_g_tuner, | 1038 | .g_tuner = tvp5150_g_tuner, |
1039 | }; | 1039 | }; |
1040 | 1040 | ||