diff --git a/[refs] b/[refs] index 4cc01c2eefef..aaebda348562 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30516058e2ad4a69ca9bdeac498ad522778bd3b5 +refs/heads/master: 7ee7142186b9acff6a142d0ebca5cfc28c85f5b5 diff --git a/trunk/drivers/staging/easycap/easycap.h b/trunk/drivers/staging/easycap/easycap.h index fe91257efeaf..e8ef1a258341 100644 --- a/trunk/drivers/staging/easycap/easycap.h +++ b/trunk/drivers/staging/easycap/easycap.h @@ -30,7 +30,6 @@ * * EASYCAP_DEBUG * EASYCAP_IS_VIDEODEV_CLIENT - * EASYCAP_NEEDS_USBVIDEO_H * * IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER * OPTIONS. @@ -90,9 +89,6 @@ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ #include #include -#ifdef EASYCAP_NEEDS_USBVIDEO_H -#include -#endif /*EASYCAP_NEEDS_USBVIDEO_H*/ #ifndef PAGE_SIZE #error "PAGE_SIZE not defined"