1 files changed, 1 insertions, 28 deletions

diff --git a/linux/drivers/media/video/bt8xx/bt832.c b/linux/drivers/media/video/bt8xx/bt832.c
index 4eefaba8f..e860f7725 100644
--- a/linux/drivers/media/video/bt8xx/bt832.c
+++ b/linux/drivers/media/video/bt8xx/bt832.c
@@ -33,9 +33,6 @@
 #include <linux/slab.h>
 #include <media/v4l2-common.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 #include "bttv.h"
 #include "bt832.h"
 
@@ -44,17 +41,10 @@ MODULE_LICENSE("GPL");
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { I2C_ADDR_BT832_ALT1>>1, I2C_ADDR_BT832_ALT2>>1,
 				       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;
 
 int debug;    /* debug output */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 module_param(debug,            int, 0644);
-#else
-MODULE_PARM(debug,            "i");
-#endif
 
 /* ---------------------------------------------------------------------- */
 
@@ -187,12 +177,7 @@ int bt832_init(struct i2c_client *i2c_client_s)
 
 
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
-#else
-static int bt832_attach(struct i2c_adapter *adap, int addr,
-			  unsigned short flags, int kind)
-#endif
 {
 	struct bt832 *t;
 
@@ -207,10 +192,6 @@ static int bt832_attach(struct i2c_adapter *adap, int addr,
 
 	v4l_info(&t->client,"chip found @ 0x%x\n", addr<<1);
 
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	MOD_INC_USE_COUNT;
-#endif
 	if(! bt832_init(&t->client)) {
 		bt832_detach(&t->client);
 		return -1;
@@ -221,13 +202,8 @@ static int bt832_attach(struct i2c_adapter *adap, int addr,
 
 static int bt832_probe(struct i2c_adapter *adap)
 {
-#ifdef I2C_CLASS_TV_ANALOG
 	if (adap->class & I2C_CLASS_TV_ANALOG)
 		return i2c_probe(adap, &addr_data, bt832_attach);
-#else
-	if (adap->id == I2C_HW_B_BT848)
-		return i2c_probe(adap, &addr_data, bt832_attach);
-#endif
 	return 0;
 }
 
@@ -238,9 +214,6 @@ static int bt832_detach(struct i2c_client *client)
 	v4l_info(&t->client,"dettach\n");
 	i2c_detach_client(client);
 	kfree(t);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	MOD_DEC_USE_COUNT;
-#endif
 	return 0;
 }
 
@@ -277,7 +250,7 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15))
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
 	.owner          = THIS_MODULE,
 #endif
 #if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)