diff --git a/[refs] b/[refs] index fbf701847f1b..caad83fafe71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4329f3c6a5fb4ed2332c7552894e7e4b8efef194 +refs/heads/master: a5b6ee06b21eaee64f100be8591fd51917bdbe36 diff --git a/trunk/drivers/staging/media/easycap/easycap.h b/trunk/drivers/staging/media/easycap/easycap.h index 9e9638ca8e95..3a081abe007d 100644 --- a/trunk/drivers/staging/media/easycap/easycap.h +++ b/trunk/drivers/staging/media/easycap/easycap.h @@ -324,8 +324,6 @@ struct easycap { int lost[INPUT_MANY]; int merit[180]; - long long int dnbydt; - int video_interface; int video_altsetting_on; int video_altsetting_off; @@ -353,7 +351,6 @@ struct easycap { u8 *pcache; int video_mt; int audio_mt; - long long audio_bytes; u32 isequence; int vma_many; @@ -450,9 +447,6 @@ struct easycap { * SOUND PROPERTIES */ /*---------------------------------------------------------------------------*/ - - int audio_buffer_many; - int allocation_audio_urb; int allocation_audio_page; int allocation_audio_struct;