4 files changed, 0 insertions, 29 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;
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c
index 084164147..e0f9f760a 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c
@@ -358,11 +358,7 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 	input_dev->dev.parent = &av7110->dev->pci->dev;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &av7110->dev->pci->dev;
-#else
-	input_dev->dev = &av7110->dev->pci->dev;
-#endif
 #endif
 	/* initial keymap */
 	memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map);
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c
index 8234c397c..f7388e5fc 100644
--- a/linux/drivers/media/dvb/ttpci/budget-ci.c
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c
@@ -211,11 +211,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 	input_dev->dev.parent = &saa->pci->dev;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &saa->pci->dev;
-#else
-	input_dev->dev = &saa->pci->dev;
-#endif
 #endif
 
 	/* Select keymap and address */
diff --git a/linux/drivers/media/dvb/ttpci/budget.h b/linux/drivers/media/dvb/ttpci/budget.h
index 0e8e596d6..6539c0171 100644
--- a/linux/drivers/media/dvb/ttpci/budget.h
+++ b/linux/drivers/media/dvb/ttpci/budget.h
@@ -12,9 +12,7 @@
 
 #include <linux/module.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include <media/saa7146.h>
 
@@ -24,13 +22,8 @@ extern int budget_debug;
 #undef dprintk
 #endif
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-#define dprintk(level,args...) \
-	    do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __func__); printk(args); } } while (0)
-#else
 #define dprintk(level,args...) \
 	    do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __func__); printk(args); } } while (0)
-#endif
 
 struct budget_info {
 	char *name;