summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/b2c2/flexcop-pci.c4
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb.h4
-rw-r--r--linux/drivers/media/dvb/frontends/stv6110.c1
3 files changed, 0 insertions, 9 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-pci.c b/linux/drivers/media/dvb/b2c2/flexcop-pci.c
index 5baf9ded9..2905ffccf 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -67,11 +67,7 @@ struct flexcop_pci {
unsigned long last_irq;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- struct work_struct irq_check_work;
-#else
struct delayed_work irq_check_work;
-#endif
struct flexcop_device *fc_dev;
};
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
index 72503e2da..1279046e0 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -364,11 +364,7 @@ struct dvb_usb_device {
/* remote control */
struct input_dev *rc_input_dev;
char rc_phys[64];
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- struct work_struct rc_query_work;
-#else
struct delayed_work rc_query_work;
-#endif
u32 last_event;
int last_state;
diff --git a/linux/drivers/media/dvb/frontends/stv6110.c b/linux/drivers/media/dvb/frontends/stv6110.c
index 94fd0fdae..70efac869 100644
--- a/linux/drivers/media/dvb/frontends/stv6110.c
+++ b/linux/drivers/media/dvb/frontends/stv6110.c
@@ -28,7 +28,6 @@
#include <linux/types.h>
#include "stv6110.h"
-#include "cx23885.h"
static int debug;