summaryrefslogtreecommitdiff
path: root/linux/include/media/video-buf.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-02-06 13:59:37 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-06 13:59:37 -0200
commitbe80b76533c8db5af8ef3464c84d56c45767ed60 (patch)
tree4ccb7c9d66f221a8c881332319523c91f10f683d /linux/include/media/video-buf.h
parente2273bb85e79b09bafd264fda1832f9fbb4f4ff5 (diff)
downloadmediapointer-dvb-s2-be80b76533c8db5af8ef3464c84d56c45767ed60.tar.gz
mediapointer-dvb-s2-be80b76533c8db5af8ef3464c84d56c45767ed60.tar.bz2
sem2mutex: drivers/media/, #2
Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Kernel-sync from patch 3318b Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media/video-buf.h')
-rw-r--r--linux/include/media/video-buf.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/include/media/video-buf.h b/linux/include/media/video-buf.h
index 6c1dc2777..dd2bb1800 100644
--- a/linux/include/media/video-buf.h
+++ b/linux/include/media/video-buf.h
@@ -178,7 +178,11 @@ struct videobuf_queue_ops {
};
struct videobuf_queue {
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+ struct mutex lock;
+#else
struct semaphore lock;
+#endif
spinlock_t *irqlock;
struct pci_dev *pci;