summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-core/dmxdev.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dmxdev.h')
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.h b/linux/drivers/media/dvb/dvb-core/dmxdev.h
index fd72920c2..356172732 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.h
@@ -30,7 +30,10 @@
#include <linux/wait.h>
#include <linux/fs.h>
#include <linux/string.h>
-#include <asm/semaphore.h>
+#include "compat.h"
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+#include <linux/mutex.h>
+#endif
#include <linux/dvb/dmx.h>
@@ -83,7 +86,11 @@ struct dmxdev_filter {
struct dmxdev *dev;
struct dmxdev_buffer buffer;
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+ struct mutex mutex;
+#else
struct semaphore mutex;
+#endif
/* only for sections */
struct timer_list timer;
@@ -117,7 +124,11 @@ struct dmxdev {
struct dmxdev_buffer dvr_buffer;
#define DVR_BUFFER_SIZE (10*188*1024)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+ struct mutex mutex;
+#else
struct semaphore mutex;
+#endif
spinlock_t lock;
};