summaryrefslogtreecommitdiff
path: root/linux/include/media/videobuf-core.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include/media/videobuf-core.h')
-rw-r--r--linux/include/media/videobuf-core.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h
index 9bb244716..b73f0ffa8 100644
--- a/linux/include/media/videobuf-core.h
+++ b/linux/include/media/videobuf-core.h
@@ -150,9 +150,9 @@ struct videobuf_qtype_ops {
struct videobuf_queue {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
- struct mutex lock;
+ struct mutex vb_lock;
#else
- struct semaphore lock;
+ struct semaphore vb_lock;
#endif
spinlock_t *irqlock;
void *dev; /* on pci, points to struct pci_dev */