---

yaml --- r: 235999 b: refs/heads/master c: 7ee7142 h: refs/heads/master i: 235997: 6752473 235995: 034daf6 235991: 3c69f21 235983: 0bbabd5 235967: 10e4edc v: v3
git-mirror · Feb 18, 2011 · 4592490 · 4592490
1 parent 1b9a23d
commit 4592490
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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 <linux/videodev2.h>
 #include <linux/soundcard.h>
-#ifdef EASYCAP_NEEDS_USBVIDEO_H
-#include <config/video/usbvideo.h>
-#endif /*EASYCAP_NEEDS_USBVIDEO_H*/
 
 #ifndef PAGE_SIZE
 #error "PAGE_SIZE not defined"