Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / drivers / media / video / dabusb.h

diff --git a/drivers/usb/media/dabusb.h b/drivers/media/video/dabusb.h
similarity index 94%
rename from drivers/usb/media/dabusb.h
rename to drivers/media/video/dabusb.h
index 10b666e..00eb34c 100644 (file)
--- a/drivers/usb/media/dabusb.h
+++ b/drivers/media/video/dabusb.h
@@ -10,7 +10,7 @@ typedef struct
 #define DABUSB_VERSION 0x1000
 #define IOCTL_DAB_BULK              _IOWR('d', 0x30, bulk_transfer_t)
 #define IOCTL_DAB_OVERRUNS         _IOR('d',  0x15, int)
-#define IOCTL_DAB_VERSION           _IOR('d', 0x3f, int) 
+#define IOCTL_DAB_VERSION           _IOR('d', 0x3f, int)
 
 #ifdef __KERNEL__
 
@@ -18,7 +18,7 @@ typedef enum { _stopped=0, _started } driver_state_t;
 
 typedef struct
 {
-       struct semaphore mutex;
+       struct mutex mutex;
        struct usb_device *usbdev;
        wait_queue_head_t wait;
        wait_queue_head_t remove_ok;
@@ -36,7 +36,7 @@ typedef struct
        struct list_head rec_buff_list;
 } dabusb_t,*pdabusb_t;
 
-typedef struct 
+typedef struct
 {
        pdabusb_t s;
        struct urb *purb;