linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / usb / media / se401.h

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 a7a216b..2e5846f 100644 (file)
--- a/drivers/media/video/se401.h
+++ b/drivers/usb/media/se401.h
@@ -5,7 +5,6 @@
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
 #include <linux/smp_lock.h>
-#include <linux/mutex.h>
 
 #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;