summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/ttpci/av7110.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110.h')
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h
index 6cbf79c3e..61e4a7569 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.h
+++ b/linux/drivers/media/dvb/ttpci/av7110.h
@@ -14,9 +14,7 @@
#include <linux/dvb/osd.h>
#include <linux/dvb/net.h>
#include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
#include <linux/mutex.h>
-#endif
#include "dvbdev.h"
#include "demux.h"
@@ -154,11 +152,7 @@ struct av7110 {
/* DEBI and polled command interface */
spinlock_t debilock;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex dcomlock;
-#else
- struct semaphore dcomlock;
-#endif
volatile int debitype;
volatile int debilen;
@@ -177,11 +171,7 @@ struct av7110 {
int osdwin; /* currently active window */
u16 osdbpp[8];
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex osd_mutex;
-#else
- struct semaphore osd_mutex;
-#endif
/* CA */
@@ -206,11 +196,7 @@ struct av7110 {
struct tasklet_struct vpe_tasklet;
int fe_synced;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex pid_mutex;
-#else
- struct semaphore pid_mutex;
-#endif
int video_blank;
struct video_status videostate;