diff options
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821.h')
-rw-r--r-- | drivers/media/pci/cx25821/cx25821.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h index 128c9f320dfb..40b16b01349b 100644 --- a/drivers/media/pci/cx25821/cx25821.h +++ b/drivers/media/pci/cx25821/cx25821.h | |||
@@ -116,15 +116,6 @@ struct cx25821_tvnorm { | |||
116 | u32 cxoformat; | 116 | u32 cxoformat; |
117 | }; | 117 | }; |
118 | 118 | ||
119 | struct cx25821_fh { | ||
120 | struct cx25821_dev *dev; | ||
121 | |||
122 | enum v4l2_priority prio; | ||
123 | |||
124 | /* video capture */ | ||
125 | int channel_id; | ||
126 | }; | ||
127 | |||
128 | enum cx25821_itype { | 119 | enum cx25821_itype { |
129 | CX25821_VMUX_COMPOSITE = 1, | 120 | CX25821_VMUX_COMPOSITE = 1, |
130 | CX25821_VMUX_SVIDEO, | 121 | CX25821_VMUX_SVIDEO, |
@@ -207,8 +198,7 @@ struct cx25821_dev; | |||
207 | struct cx25821_channel { | 198 | struct cx25821_channel { |
208 | unsigned id; | 199 | unsigned id; |
209 | struct cx25821_dev *dev; | 200 | struct cx25821_dev *dev; |
210 | struct cx25821_fh *streaming_fh; | 201 | struct v4l2_fh *streaming_fh; |
211 | struct v4l2_prio_state prio; | ||
212 | 202 | ||
213 | struct v4l2_ctrl_handler hdl; | 203 | struct v4l2_ctrl_handler hdl; |
214 | struct cx25821_data timeout_data; | 204 | struct cx25821_data timeout_data; |
@@ -360,7 +350,6 @@ struct cx25821_dev { | |||
360 | int pixel_format; | 350 | int pixel_format; |
361 | int channel_select; | 351 | int channel_select; |
362 | int command; | 352 | int command; |
363 | int channel_opened; | ||
364 | }; | 353 | }; |
365 | 354 | ||
366 | struct upstream_user_struct { | 355 | struct upstream_user_struct { |