Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6] / include / media / video-buf.h

diff --git a/include/media/video-buf.h b/include/media/video-buf.h
index ae8d7a0004402715d015e2962287a9a9c9161f00..d90dec5484ee367966694c37d7db07e964282c95 100644 (file)
--- a/include/media/video-buf.h
+++ b/include/media/video-buf.h
@@ -17,7 +17,7 @@
  * (at your option) any later version.
  */
 
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 
 #define UNSET (-1U)
 
@@ -177,7 +177,7 @@ struct videobuf_queue_ops {
 };
 
 struct videobuf_queue {
-        struct semaphore           lock;
+       struct mutex               lock;
        spinlock_t                 *irqlock;
        struct pci_dev             *pci;