summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-driver.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h
index 7d69337ee..f4fe889d9 100644
--- a/linux/drivers/media/video/ivtv/ivtv-driver.h
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.h
@@ -729,7 +729,11 @@ struct ivtv {
int search_pack_header;
spinlock_t dma_reg_lock; /* lock access to DMA engine registers */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex serialize_lock; /* lock used to serialize starting streams */
+#else
+ struct semaphore serialize_lock; /* lock used to serialize starting streams */
+#endif
/* User based DMA for OSD */
struct ivtv_user_dma udma;