1 files changed, 0 insertions, 37 deletions
diff --git a/linux/drivers/media/video/saa6588.c b/linux/drivers/media/video/saa6588.c
index 0774c351a..ab41d9526 100644
--- a/linux/drivers/media/video/saa6588.c
+++ b/linux/drivers/media/video/saa6588.c
@@ -31,10 +31,6 @@
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
-
 #include <media/rds.h>
 #include "compat.h"
 
@@ -45,9 +41,6 @@ static unsigned short normal_i2c[] = {
 	I2C_CLIENT_END,
 };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
-#endif
 I2C_CLIENT_INSMOD;
 
 /* insmod options */
@@ -404,11 +397,7 @@ static int saa6588_configure(struct saa6588 *s)
 
 /* ---------------------------------------------------------------------- */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
-#else
-static int saa6588_attach(struct i2c_adapter *adap, int addr, unsigned short flags, int kind)
-#endif
 {
 	struct saa6588 *s;
 	client_template.adapter = adap;
@@ -448,28 +437,13 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, unsigned short fla
 	s->timer.function = saa6588_timer;
 	s->timer.data = (unsigned long)s;
 	schedule_work(&s->work);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	MOD_INC_USE_COUNT;
-#endif
 	return 0;
 }
 
 static int saa6588_probe(struct i2c_adapter *adap)
 {
-#ifdef I2C_CLASS_TV_ANALOG
 	if (adap->class & I2C_CLASS_TV_ANALOG)
 		return i2c_probe(adap, &addr_data, saa6588_attach);
-#else
-	switch (adap->id) {
-	case I2C_HW_B_BT848:
-	case I2C_HW_B_RIVA:
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-	case I2C_HW_SAA7134:
-#endif
-		return i2c_probe(adap, &addr_data, saa6588_attach);
-		break;
-	}
-#endif
 	return 0;
 }
 
@@ -526,17 +500,9 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd,
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)) && ( LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15))
-	.owner = THIS_MODULE,
-#endif
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.name = "saa6588",
-	.flags = I2C_DF_NOTIFY,
-#else
 	.driver = {
 		.name = "saa6588",
 	},
-#endif
 	.id = -1,		/* FIXME */
 	.attach_adapter = saa6588_probe,
 	.detach_client = saa6588_detach,
@@ -545,9 +511,6 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template = {
 	.name = "saa6588",
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.flags = I2C_CLIENT_ALLOW_USE,
-#endif
 	.driver = &driver,
 };