diff --git a/[refs] b/[refs] index 08771d4764b1..6dd513e1c424 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 948a49aa692e12cc33558e407898c467b22bf9b4 +refs/heads/master: cbe7f8a030f2056d5cee8c2729d5edd23ae61589 diff --git a/trunk/drivers/media/usb/em28xx/em28xx.h b/trunk/drivers/media/usb/em28xx/em28xx.h index 304896de4879..b3d72a92dd9b 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx.h +++ b/trunk/drivers/media/usb/em28xx/em28xx.h @@ -252,7 +252,6 @@ struct em28xx_buffer { /* common v4l buffer stuff -- must be first */ struct videobuf_buffer vb; - struct list_head frame; int top_field; };