diff options
Diffstat (limited to 'drivers/media/video/uvc/uvcvideo.h')
-rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index 9e6948fb3e6..7ec9a04ced5 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h | |||
@@ -293,11 +293,9 @@ struct uvc_entity { | |||
293 | } media; | 293 | } media; |
294 | 294 | ||
295 | struct { | 295 | struct { |
296 | __u8 bSourceID; | ||
297 | } output; | 296 | } output; |
298 | 297 | ||
299 | struct { | 298 | struct { |
300 | __u8 bSourceID; | ||
301 | __u16 wMaxMultiplier; | 299 | __u16 wMaxMultiplier; |
302 | __u8 bControlSize; | 300 | __u8 bControlSize; |
303 | __u8 *bmControls; | 301 | __u8 *bmControls; |
@@ -305,21 +303,20 @@ struct uvc_entity { | |||
305 | } processing; | 303 | } processing; |
306 | 304 | ||
307 | struct { | 305 | struct { |
308 | __u8 bNrInPins; | ||
309 | __u8 *baSourceID; | ||
310 | } selector; | 306 | } selector; |
311 | 307 | ||
312 | struct { | 308 | struct { |
313 | __u8 guidExtensionCode[16]; | 309 | __u8 guidExtensionCode[16]; |
314 | __u8 bNumControls; | 310 | __u8 bNumControls; |
315 | __u8 bNrInPins; | ||
316 | __u8 *baSourceID; | ||
317 | __u8 bControlSize; | 311 | __u8 bControlSize; |
318 | __u8 *bmControls; | 312 | __u8 *bmControls; |
319 | __u8 *bmControlsType; | 313 | __u8 *bmControlsType; |
320 | } extension; | 314 | } extension; |
321 | }; | 315 | }; |
322 | 316 | ||
317 | __u8 bNrInPins; | ||
318 | __u8 *baSourceID; | ||
319 | |||
323 | unsigned int ncontrols; | 320 | unsigned int ncontrols; |
324 | struct uvc_control *controls; | 321 | struct uvc_control *controls; |
325 | }; | 322 | }; |