9 files changed, 0 insertions, 50 deletions
diff --git a/linux/drivers/media/common/ir-functions.c b/linux/drivers/media/common/ir-functions.c
index 2adbb6e9f..3653b6d37 100644
--- a/linux/drivers/media/common/ir-functions.c
+++ b/linux/drivers/media/common/ir-functions.c
@@ -67,10 +67,6 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
 	if (ir_codes)
 		memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
-	init_input_dev(dev);
-#endif
-
 	dev->keycode     = ir->ir_codes;
 	dev->keycodesize = sizeof(IR_KEYTAB_TYPE);
 	dev->keycodemax  = IR_KEYTAB_SIZE;
diff --git a/linux/drivers/media/common/ir-keymaps.c b/linux/drivers/media/common/ir-keymaps.c
index 09ad649ec..a464ad34e 100644
--- a/linux/drivers/media/common/ir-keymaps.c
+++ b/linux/drivers/media/common/ir-keymaps.c
@@ -2289,4 +2289,3 @@ IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE] = {
 	[0x2a] = KEY_MENU,
 };
 EXPORT_SYMBOL_GPL(ir_codes_avermedia_a16d);
-
diff --git a/linux/drivers/media/common/tuners/mt20xx.c b/linux/drivers/media/common/tuners/mt20xx.c
index d2c281aeb..9d9f1cf11 100644
--- a/linux/drivers/media/common/tuners/mt20xx.c
+++ b/linux/drivers/media/common/tuners/mt20xx.c
@@ -10,9 +10,6 @@
 #include <linux/videodev.h>
 #include "tuner-i2c.h"
 #include "mt20xx.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 
 static int debug;
 module_param(debug, int, 0644);
diff --git a/linux/drivers/media/common/tuners/tda18271-priv.h b/linux/drivers/media/common/tuners/tda18271-priv.h
index 2ed61a31f..78417b7c1 100644
--- a/linux/drivers/media/common/tuners/tda18271-priv.h
+++ b/linux/drivers/media/common/tuners/tda18271-priv.h
@@ -24,11 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 #include <linux/mutex.h>
-#else
-#include <asm/semaphore.h>
-#endif
 #include "tuner-i2c.h"
 #include "tda18271.h"
 
@@ -127,11 +123,7 @@ struct tda18271_priv {
 	struct tda18271_std_map std;
 	struct tda18271_rf_tracking_filter_cal rf_cal_state[8];
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 	struct mutex lock;
-#else
-	struct semaphore lock;
-#endif
 
 	u32 frequency;
 	u32 bandwidth;
diff --git a/linux/drivers/media/common/tuners/tda8290.c b/linux/drivers/media/common/tuners/tda8290.c
index 9bda53be5..751845554 100644
--- a/linux/drivers/media/common/tuners/tda8290.c
+++ b/linux/drivers/media/common/tuners/tda8290.c
@@ -28,9 +28,6 @@
 #include "tda8290.h"
 #include "tda827x.h"
 #include "tda18271.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 
 static int debug;
 module_param(debug, int, 0644);
diff --git a/linux/drivers/media/common/tuners/tda9887.c b/linux/drivers/media/common/tuners/tda9887.c
index e98de7d40..61a56026d 100644
--- a/linux/drivers/media/common/tuners/tda9887.c
+++ b/linux/drivers/media/common/tuners/tda9887.c
@@ -8,9 +8,6 @@
 #include <linux/delay.h>
 #include "compat.h"
 #include <linux/videodev.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 #include "tuner-i2c.h"
@@ -438,17 +435,10 @@ static unsigned int port2  = UNSET;
 static unsigned int qss    = UNSET;
 static unsigned int adjust = UNSET;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM(port1, "i");
-MODULE_PARM(port2, "i");
-MODULE_PARM(qss, "i");
-MODULE_PARM(adjust, "i");
-#else
 module_param(port1, int, 0644);
 module_param(port2, int, 0644);
 module_param(qss, int, 0644);
 module_param(adjust, int, 0644);
-#endif
 
 static int tda9887_set_insmod(struct dvb_frontend *fe)
 {
diff --git a/linux/drivers/media/common/tuners/tea5767.c b/linux/drivers/media/common/tuners/tea5767.c
index 5990a63ef..c56ff2dc1 100644
--- a/linux/drivers/media/common/tuners/tea5767.c
+++ b/linux/drivers/media/common/tuners/tea5767.c
@@ -16,9 +16,6 @@
 #include <linux/videodev.h>
 #include "tuner-i2c.h"
 #include "tea5767.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 
 static int debug;
 module_param(debug, int, 0644);
diff --git a/linux/drivers/media/common/tuners/tuner-simple.c b/linux/drivers/media/common/tuners/tuner-simple.c
index c9d70e4b2..a029cf8f5 100644
--- a/linux/drivers/media/common/tuners/tuner-simple.c
+++ b/linux/drivers/media/common/tuners/tuner-simple.c
@@ -11,9 +11,6 @@
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
 #include <media/tuner-types.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 #include "tuner-i2c.h"
 #include "tuner-simple.h"
 
@@ -25,11 +22,7 @@ MODULE_PARM_DESC(debug, "enable verbose debug messages");
 static unsigned int simple_devcount;
 
 static int offset;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM(offset, "i");
-#else
 module_param(offset, int, 0664);
-#endif
 MODULE_PARM_DESC(offset, "Allows to specify an offset for tuner");
 
 static unsigned int atv_input[TUNER_SIMPLE_MAX] = \
diff --git a/linux/drivers/media/common/tuners/tuner-xc2028.c b/linux/drivers/media/common/tuners/tuner-xc2028.c
index c51a7b4c8..88fd2c91c 100644
--- a/linux/drivers/media/common/tuners/tuner-xc2028.c
+++ b/linux/drivers/media/common/tuners/tuner-xc2028.c
@@ -14,17 +14,10 @@
 #include <linux/videodev2.h>
 #include <linux/delay.h>
 #include <media/tuner.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
 #include <linux/mutex.h>
-#else
-#include <asm/semaphore.h>
-#endif
 #include "compat.h"
 #include <asm/unaligned.h>
 #include "tuner-i2c.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
-#include "i2c-compat.h"
-#endif
 #include "tuner-xc2028.h"
 #include "tuner-xc2028-types.h"
 
@@ -98,11 +91,7 @@ struct xc2028_data {
 
 	struct firmware_properties cur_fw;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
 	struct mutex lock;
-#else
-	struct semaphore lock;
-#endif
 };
 
 #define i2c_send(priv, buf, size) ({					\