diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-06-27 06:07:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-08 23:43:06 -0300 |
| commit | f7b80e6919df812b4bed99a927325312a904111b (patch) | |
| tree | 6828bb6bfeea81a8345b148dbca8b2fdcadec7eb /drivers/media/video/ivtv/ivtv-driver.h | |
| parent | 2fd781448acd6cbc3ca9d2f48b0e16f67a77bf51 (diff) | |
V4L/DVB: ivtv: convert to the new control framework
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index d2260de4c812..75803141481e 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h @@ -62,6 +62,7 @@ #include <linux/dvb/audio.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> +#include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-fh.h> #include <media/tuner.h> @@ -631,8 +632,9 @@ struct ivtv { struct ivtv_options options; /* user options */ struct v4l2_device v4l2_dev; - struct v4l2_subdev sd_gpio; /* GPIO sub-device */ + struct cx2341x_handler cxhdl; struct v4l2_ctrl_handler hdl_gpio; + struct v4l2_subdev sd_gpio; /* GPIO sub-device */ u16 instance; /* High-level state info */ @@ -649,7 +651,6 @@ struct ivtv { v4l2_std_id std_out; /* current TV output standard */ u8 audio_stereo_mode; /* decoder setting how to handle stereo MPEG audio */ u8 audio_bilingual_mode; /* decoder setting how to handle bilingual MPEG audio */ - struct cx2341x_mpeg_params params; /* current encoder parameters */ /* Locking */ |