summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/bt8xx/bt878.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/bt8xx/bt878.h')
-rw-r--r--linux/drivers/media/dvb/bt8xx/bt878.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/bt878.h b/linux/drivers/media/dvb/bt8xx/bt878.h
index 9bef8bbdb..8319457f7 100644
--- a/linux/drivers/media/dvb/bt8xx/bt878.h
+++ b/linux/drivers/media/dvb/bt8xx/bt878.h
@@ -26,9 +26,7 @@
#include <linux/sched.h>
#include <linux/spinlock.h>
#include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
#include <linux/mutex.h>
-#endif
#include "bt848.h"
#include "bttv.h"
@@ -107,11 +105,7 @@
extern int bt878_num;
struct bt878 {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex gpio_lock;
-#else
- struct semaphore gpio_lock;
-#endif
unsigned int nr;
unsigned int bttv_nr;
struct i2c_adapter *adapter;