V4L/DVB (7121): Renames videobuf lock to vb_lock

[deliverable/linux.git] / include / media / videobuf-core.h

diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 97f14d469595fd03e12adcd01457b266527d8d04..99033945cdee3790c45240ac0f43a2f61fdec749 100644 (file)
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -149,7 +149,7 @@ struct videobuf_qtype_ops {
 };
 
 struct videobuf_queue {
-       struct mutex               lock;
+       struct mutex               vb_lock;
        spinlock_t                 *irqlock;
        void                       *dev; /* on pci, points to struct pci_dev */