summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/cx231xx/cx231xx.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-01-29 17:18:09 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-05 18:26:04 +0100
commit88b6ffedd90158173eb74c8f9169208277520cbc (patch)
treeae6904dd0cad6b1b6abce4bad0df5fb75d10ef86 /drivers/media/usb/cx231xx/cx231xx.h
parent[media] cx231xx-417: share ioctls with cx231xx-video (diff)
downloadlinux-88b6ffedd90158173eb74c8f9169208277520cbc.tar.xz
linux-88b6ffedd90158173eb74c8f9169208277520cbc.zip
[media] cx231xx-417: convert to the control framework
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/cx231xx/cx231xx.h')
-rw-r--r--drivers/media/usb/cx231xx/cx231xx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index 6130e4f5924d..0f92fd1ea794 100644
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -612,6 +612,7 @@ struct cx231xx {
struct v4l2_subdev *sd_tuner;
struct v4l2_ctrl_handler ctrl_handler;
struct v4l2_ctrl_handler radio_ctrl_handler;
+ struct cx2341x_handler mpeg_ctrl_handler;
struct work_struct wq_trigger; /* Trigger to start/stop audio for alsa module */
atomic_t stream_started; /* stream should be running if true */
@@ -715,7 +716,6 @@ struct cx231xx {
u8 USE_ISO;
struct cx231xx_tvnorm encodernorm;
struct cx231xx_tsport ts1, ts2;
- struct cx2341x_mpeg_params mpeg_params;
struct video_device *v4l_device;
atomic_t v4l_reader_count;
u32 freq;