X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fse401.h;fp=drivers%2Fusb%2Fmedia%2Fse401.h;h=c0891b3e0018efd404cd585b28624a2a7cdc655d;hb=a2f44b27303a5353859d77a3e96a1d3f33f56ab7;hp=2e5846f1eb2044acffb5c16da7777bd825528121;hpb=134734d875a0a48d994ef20b9905209b4b8b6f75;p=linux-2.6.git

diff --git a/drivers/usb/media/se401.h b/drivers/media/video/se401.h
similarity index 97%
rename from drivers/usb/media/se401.h
rename to drivers/media/video/se401.h
index 2e5846f1e..c0891b3e0 100644
--- a/drivers/usb/media/se401.h
+++ b/drivers/media/video/se401.h
@@ -4,7 +4,9 @@
 
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
+#include <media/v4l2-common.h>
 #include <linux/smp_lock.h>
+#include <linux/mutex.h>
 
 #define se401_DEBUG	/* Turn on debug messages */
 
@@ -176,7 +178,7 @@ struct usb_se401 {
 	int expose_m;
 	int expose_l;
 	int resetlevel;
-	
+
 	int enhance;
 
 	int format;
@@ -189,7 +191,7 @@ struct usb_se401 {
 	int maxframesize;
 	int cframesize;		/* current framesize */
 
-	struct semaphore lock;
+	struct mutex lock;
 	int user;		/* user count for exclusive use */
 	int removed;		/* device disconnected */
 
@@ -199,12 +201,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;