X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fmedia%2Fusbvideo.h;fp=drivers%2Fmedia%2Fvideo%2Fusbvideo%2Fusbvideo.h;h=6c390a1f981b1510125446f95c006cae0f243214;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=3cbf4fc499a337c263fd34833f04f6fe0e9219dd;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/usb/media/usbvideo.h
similarity index 96%
rename from drivers/media/video/usbvideo/usbvideo.h
rename to drivers/usb/media/usbvideo.h
index 3cbf4fc49..6c390a1f9 100644
--- a/drivers/media/video/usbvideo/usbvideo.h
+++ b/drivers/usb/media/usbvideo.h
@@ -19,7 +19,6 @@
 #include <linux/config.h>
 #include <linux/videodev.h>
 #include <linux/usb.h>
-#include <linux/mutex.h>
 
 /* Most helpful debugging aid */
 #define assert(expr) ((void) ((expr) ? 0 : (err("assert failed at line %d",__LINE__))))
@@ -189,11 +188,11 @@ struct usbvideo_frame {
 
 /* Statistics that can be overlaid on screen */
 struct usbvideo_statistics {
-	unsigned long frame_num;	/* Sequential number of the frame */
-	unsigned long urb_count;        /* How many URBs we received so far */
-	unsigned long urb_length;       /* Length of last URB */
-	unsigned long data_count;       /* How many bytes we received */
-	unsigned long header_count;     /* How many frame headers we found */
+        unsigned long frame_num;	/* Sequential number of the frame */
+        unsigned long urb_count;        /* How many URBs we received so far */
+        unsigned long urb_length;       /* Length of last URB */
+        unsigned long data_count;       /* How many bytes we received */
+        unsigned long header_count;     /* How many frame headers we found */
 	unsigned long iso_skip_count;	/* How many empty ISO packets received */
 	unsigned long iso_err_count;	/* How many bad ISO packets received */
 };
@@ -214,7 +213,7 @@ struct uvd {
 	unsigned long flags;		/* FLAGS_USBVIDEO_xxx */
 	unsigned long paletteBits;	/* Which palettes we accept? */
 	unsigned short defaultPalette;	/* What palette to use for read() */
-	struct mutex lock;
+	struct semaphore lock;
 	int user;		/* user count for exclusive use */
 
 	videosize_t videosize;	/* Current setting */
@@ -273,7 +272,7 @@ struct usbvideo {
 	int num_cameras;		/* As allocated */
 	struct usb_driver usbdrv;	/* Interface to the USB stack */
 	char drvName[80];		/* Driver name */
-	struct mutex lock;		/* Mutex protecting camera structures */
+	struct semaphore lock;		/* Mutex protecting camera structures */
 	struct usbvideo_cb cb;		/* Table of callbacks (virtual methods) */
 	struct video_device vdt;	/* Video device template */
 	struct uvd *cam;			/* Array of camera structures */