X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fmedia%2Fse401.h;fp=drivers%2Fmedia%2Fvideo%2Fse401.h;h=2e5846f1eb2044acffb5c16da7777bd825528121;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=a7a216bd4413cb4554e9ab656bff86c40363dabb;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git diff --git a/drivers/media/video/se401.h b/drivers/usb/media/se401.h similarity index 98% rename from drivers/media/video/se401.h rename to drivers/usb/media/se401.h index a7a216bd4..2e5846f1e 100644 --- a/drivers/media/video/se401.h +++ b/drivers/usb/media/se401.h @@ -5,7 +5,6 @@ #include #include #include -#include #define se401_DEBUG /* Turn on debug messages */ @@ -177,7 +176,7 @@ struct usb_se401 { int expose_m; int expose_l; int resetlevel; - + int enhance; int format; @@ -190,7 +189,7 @@ struct usb_se401 { int maxframesize; int cframesize; /* current framesize */ - struct mutex lock; + struct semaphore lock; int user; /* user count for exclusive use */ int removed; /* device disconnected */ @@ -200,12 +199,12 @@ struct usb_se401 { struct urb *urb[SE401_NUMSBUF]; struct urb *inturb; - + int button; int buttonpressed; int curframe; /* Current receiving frame */ - struct se401_frame frame[SE401_NUMFRAMES]; + struct se401_frame frame[SE401_NUMFRAMES]; int readcount; int framecount; int error;