From 4592490731c0cdf57afcfcc9626951430054db2a Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Tue, 15 Feb 2011 14:15:19 +0200
Subject: [PATCH] --- yaml --- r: 235999 b: refs/heads/master c:
 7ee7142186b9acff6a142d0ebca5cfc28c85f5b5 h: refs/heads/master i:   235997:
 675247366746169659e4fea2afbad8aa8cd396f4   235995:
 034daf6c3e56a31c0681786e0da98cb6e7dcc258   235991:
 3c69f216e82f1b2cccba5f010869ac9626793b24   235983:
 0bbabd55708c258cb1876ef0377d0d320b7b9c06   235967:
 10e4edc3864e9c22bfb4455431d9dfddf20700cc v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/easycap/easycap.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

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 <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"