diff -ruN bttv-0.7.107/driver/bt832.c bttv-0.7.107-i2c/driver/bt832.c
--- bttv-0.7.107/driver/bt832.c	Thu May  8 14:03:26 2003
+++ bttv-0.7.107-i2c/driver/bt832.c	Sat Feb 28 21:13:03 2004
@@ -260,7 +260,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner          = THIS_MODULE,
 #endif
         .name           = "i2c bt832 driver",
diff -ruN bttv-0.7.107/driver/bttv-if.c bttv-0.7.107-i2c/driver/bttv-if.c
--- bttv-0.7.107/driver/bttv-if.c	Tue Jun 24 14:28:11 2003
+++ bttv-0.7.107-i2c/driver/bttv-if.c	Sat Feb 28 21:18:41 2004
@@ -190,7 +190,7 @@
 	return state;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,54)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void bttv_inc_use(struct i2c_adapter *adap)
 {
 	MOD_INC_USE_COUNT;
@@ -243,9 +243,9 @@
 };
 
 static struct i2c_adapter bttv_i2c_adap_template = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner             = THIS_MODULE,
-	.class             = I2C_ADAP_CLASS_TV_ANALOG,
+/*	.class             = I2C_ADAP_CLASS_TV_ANALOG,*/
 #else
 	.inc_use           = bttv_inc_use,
 	.dec_use           = bttv_dec_use,
diff -ruN bttv-0.7.107/driver/dpl3518.c bttv-0.7.107-i2c/driver/dpl3518.c
--- bttv-0.7.107/driver/dpl3518.c	Fri Jun  6 15:23:45 2003
+++ bttv-0.7.107-i2c/driver/dpl3518.c	Sat Feb 28 21:13:38 2004
@@ -361,7 +361,7 @@
 /* ---------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner          = THIS_MODULE,
 #endif
         .name           = "i2c dpl3518 driver",
diff -ruN bttv-0.7.107/driver/msp3400.c bttv-0.7.107-i2c/driver/msp3400.c
--- bttv-0.7.107/driver/msp3400.c	Wed Jun 25 13:24:46 2003
+++ bttv-0.7.107-i2c/driver/msp3400.c	Sat Feb 28 21:11:14 2004
@@ -1259,7 +1259,7 @@
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner          = THIS_MODULE,
 #endif
         .name           = "i2c msp3400 driver",
diff -ruN bttv-0.7.107/driver/tda7432.c bttv-0.7.107-i2c/driver/tda7432.c
--- bttv-0.7.107/driver/tda7432.c	Wed May  7 11:36:03 2003
+++ bttv-0.7.107-i2c/driver/tda7432.c	Sat Feb 28 21:14:26 2004
@@ -533,7 +533,7 @@
 }
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner           = THIS_MODULE,
 #endif
         .name            = "i2c tda7432 driver",
diff -ruN bttv-0.7.107/driver/tda9875.c bttv-0.7.107-i2c/driver/tda9875.c
--- bttv-0.7.107/driver/tda9875.c	Wed May  7 11:34:31 2003
+++ bttv-0.7.107-i2c/driver/tda9875.c	Sat Feb 28 21:14:18 2004
@@ -404,7 +404,7 @@
 
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner          = THIS_MODULE,
 #endif
         .name           = "i2c tda9875 driver",
diff -ruN bttv-0.7.107/driver/tda9887.c bttv-0.7.107-i2c/driver/tda9887.c
--- bttv-0.7.107/driver/tda9887.c	Tue May 20 10:11:24 2003
+++ bttv-0.7.107-i2c/driver/tda9887.c	Sat Feb 28 21:14:12 2004
@@ -456,7 +456,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner          = THIS_MODULE,
 #endif
         .name           = "i2c tda9887 driver",
diff -ruN bttv-0.7.107/driver/tuner.c bttv-0.7.107-i2c/driver/tuner.c
--- bttv-0.7.107/driver/tuner.c	Tue Jun 24 18:22:11 2003
+++ bttv-0.7.107-i2c/driver/tuner.c	Sat Feb 28 21:14:05 2004
@@ -991,7 +991,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner          = THIS_MODULE,
 #endif
         .name           = "i2c TV tuner driver",
diff -ruN bttv-0.7.107/driver/tvaudio.c bttv-0.7.107-i2c/driver/tvaudio.c
--- bttv-0.7.107/driver/tvaudio.c	Wed Jun 25 13:24:53 2003
+++ bttv-0.7.107-i2c/driver/tvaudio.c	Sat Feb 28 21:00:16 2004
@@ -1476,7 +1476,7 @@
 	chip->shadow.count = desc->registers+1;
         chip->prevmode = -1;
 	/* register */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	MOD_INC_USE_COUNT;
 #endif
 	i2c_attach_client(&chip->c);
@@ -1553,7 +1553,7 @@
 	
 	i2c_detach_client(&chip->c);
 	kfree(chip);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	MOD_DEC_USE_COUNT;
 #endif
 	return 0;
@@ -1666,7 +1666,7 @@
 
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner           = THIS_MODULE,
 #endif
         .name            = "generic i2c audio driver",
diff -ruN bttv-0.7.107/driver/tvmixer.c bttv-0.7.107-i2c/driver/tvmixer.c
--- bttv-0.7.107/driver/tvmixer.c	Sat Feb 28 21:32:14 2004
+++ bttv-0.7.107-i2c/driver/tvmixer.c	Sat Feb 28 21:33:00 2004
@@ -196,13 +196,6 @@
 
 	/* lock bttv in memory while the mixer is in use  */
 	file->private_data = mix;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,54)
-	if (client->adapter->inc_use)
-		client->adapter->inc_use(client->adapter);
-#else
-	if (client->adapter->owner)
-		try_module_get(client->adapter->owner);
-#endif
         return 0;
 }
 
@@ -216,18 +209,11 @@
 		return -ENODEV;
 	}
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,54)
-	if (client->adapter->dec_use)
-		client->adapter->dec_use(client->adapter);
-#else
-	if (client->adapter->owner)
-		module_put(client->adapter->owner);
-#endif
 	return 0;
 }
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner           = THIS_MODULE,
 #endif
 	.name            = "tv card mixer driver",