diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 04bacdbd10bb..84bdf0f42a8e 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h | |||
@@ -383,7 +383,6 @@ struct ivtv_open_id { | |||
383 | u32 open_id; /* unique ID for this file descriptor */ | 383 | u32 open_id; /* unique ID for this file descriptor */ |
384 | int type; /* stream type */ | 384 | int type; /* stream type */ |
385 | int yuv_frames; /* 1: started OUT_UDMA_YUV output mode */ | 385 | int yuv_frames; /* 1: started OUT_UDMA_YUV output mode */ |
386 | enum v4l2_priority prio; /* priority */ | ||
387 | struct ivtv *itv; | 386 | struct ivtv *itv; |
388 | }; | 387 | }; |
389 | 388 | ||
@@ -710,7 +709,6 @@ struct ivtv { | |||
710 | 709 | ||
711 | /* Miscellaneous */ | 710 | /* Miscellaneous */ |
712 | u32 open_id; /* incremented each time an open occurs, is >= 1 */ | 711 | u32 open_id; /* incremented each time an open occurs, is >= 1 */ |
713 | struct v4l2_prio_state prio; /* priority state */ | ||
714 | int search_pack_header; /* 1 if ivtv_copy_buf_to_user() is scanning for a pack header (0xba) */ | 712 | int search_pack_header; /* 1 if ivtv_copy_buf_to_user() is scanning for a pack header (0xba) */ |
715 | int speed; /* current playback speed setting */ | 713 | int speed; /* current playback speed setting */ |
716 | u8 speed_mute_audio; /* 1 if audio should be muted when fast forward */ | 714 | u8 speed_mute_audio; /* 1 if audio should be muted when fast forward */ |