Merge ../linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / usbvision / usbvision.h

diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h
index c5b6c501c869fc638dfa6aea3a7bdae7e8833247..20d7ec624999d677037dea1cb5ff26d8345ef71f 100644 (file)
--- a/drivers/media/video/usbvision/usbvision.h
+++ b/drivers/media/video/usbvision/usbvision.h
@@ -34,16 +34,13 @@
 #include <linux/list.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
+#include <linux/mutex.h>
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 #include <linux/videodev2.h>
 
 #define USBVISION_DEBUG                /* Turn on debug messages */
 
-#ifndef VID_HARDWARE_USBVISION
-       #define VID_HARDWARE_USBVISION 34   /* USBVision Video Grabber */
-#endif
-
 #define USBVISION_PWR_REG              0x00
        #define USBVISION_SSPND_EN              (1 << 1)
        #define USBVISION_RES2                  (1 << 2)
@@ -373,7 +370,6 @@ struct usb_usbvision {
        int ctrlUrbBusy;
        struct usb_ctrlrequest ctrlUrbSetup;
        wait_queue_head_t ctrlUrb_wq;                                   // Processes waiting
-       struct semaphore ctrlUrbLock;
 
        /* configuration part */
        int have_tuner;
@@ -396,7 +392,7 @@ struct usb_usbvision {
        unsigned char iface;                                            /* Video interface number */
        unsigned char ifaceAlt;                 /* Alt settings */
        unsigned char Vin_Reg2_Preset;
-       struct semaphore lock;
+       struct mutex               lock;
        struct timer_list powerOffTimer;
        struct work_struct powerOffWork;
        int power;                                                      /* is the device powered on? */