diff --git a/[refs] b/[refs] index 90766a99f0cc..475df0572f3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb04af205e4b1f0aaa9010726faf95da67f10152 +refs/heads/master: 959a181681d7aff659c591fcbf7e5ed424181bb5 diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h index 009a95a4cb02..700feb25535e 100644 --- a/trunk/drivers/media/video/em28xx/em28xx.h +++ b/trunk/drivers/media/video/em28xx/em28xx.h @@ -250,7 +250,6 @@ struct em28xx_buffer { struct list_head frame; int top_field; - int receiving; }; struct em28xx_dmaqueue {