diff -u driver-zoran-0.9.4-orig/adv7170.c driver-zoran-0.9.4-i2c/adv7170.c
--- driver-zoran-0.9.4-orig/adv7170.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/adv7170.c	2003-07-08 18:38:33.000000000 +0200
@@ -504,7 +504,7 @@
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void
 adv7170_inc_use (struct i2c_client *client)
 {
@@ -521,7 +521,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7170 = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner = THIS_MODULE,
 #endif
 	.name = "adv7170",	/* name */
@@ -532,7 +532,7 @@
 	.attach_adapter = adv7170_attach_adapter,
 	.detach_client = adv7170_detach_client,
 	.command = adv7170_command,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	.inc_use = adv7170_inc_use,
 	.dec_use = adv7170_dec_use,
 #endif
diff -u driver-zoran-0.9.4-orig/adv7175.c driver-zoran-0.9.4-i2c/adv7175.c
--- driver-zoran-0.9.4-orig/adv7175.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/adv7175.c	2003-07-08 18:38:59.000000000 +0200
@@ -527,7 +527,7 @@
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void
 adv7175_inc_use (struct i2c_client *client)
 {
@@ -544,7 +544,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7175 = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner = THIS_MODULE,
 #endif
 	.name = "adv7175",	/* name */
@@ -555,7 +555,7 @@
 	.attach_adapter = adv7175_attach_adapter,
 	.detach_client = adv7175_detach_client,
 	.command = adv7175_command,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	.inc_use = adv7175_inc_use,
 	.dec_use = adv7175_dec_use,
 #endif
diff -u driver-zoran-0.9.4-orig/bt819.c driver-zoran-0.9.4-i2c/bt819.c
--- driver-zoran-0.9.4-orig/bt819.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/bt819.c	2003-07-08 18:40:14.000000000 +0200
@@ -623,7 +623,7 @@
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void
 bt819_inc_use (struct i2c_client *client)
 {
@@ -640,7 +640,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_bt819 = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner = THIS_MODULE,
 #endif
 	.name = "bt819",
@@ -651,7 +651,7 @@
 	.attach_adapter = bt819_attach_adapter,
 	.detach_client = bt819_detach_client,
 	.command = bt819_command,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	.inc_use = bt819_inc_use,
 	.dec_use = bt819_dec_use,
 #endif
diff -u driver-zoran-0.9.4-orig/bt856.c driver-zoran-0.9.4-i2c/bt856.c
--- driver-zoran-0.9.4-orig/bt856.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/bt856.c	2003-07-08 18:39:54.000000000 +0200
@@ -404,7 +404,7 @@
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void
 bt856_inc_use (struct i2c_client *client)
 {
@@ -421,7 +421,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_bt856 = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner = THIS_MODULE,
 #endif
 	.name = "bt856",
@@ -432,7 +432,7 @@
 	.attach_adapter = bt856_attach_adapter,
 	.detach_client = bt856_detach_client,
 	.command = bt856_command,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	.inc_use = bt856_inc_use,
 	.dec_use = bt856_dec_use,
 #endif
diff -u driver-zoran-0.9.4-orig/saa7110.c driver-zoran-0.9.4-i2c/saa7110.c
--- driver-zoran-0.9.4-orig/saa7110.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/saa7110.c	2003-07-08 18:40:50.000000000 +0200
@@ -579,7 +579,7 @@
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void
 saa7110_inc_use (struct i2c_client *client)
 {
@@ -596,7 +596,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7110 = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner = THIS_MODULE,
 #endif
 	.name = "saa7110",
@@ -607,7 +607,7 @@
 	.attach_adapter = saa7110_attach_adapter,
 	.detach_client = saa7110_detach_client,
 	.command = saa7110_command,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	.inc_use = saa7110_inc_use,
 	.dec_use = saa7110_dec_use,
 #endif
diff -u driver-zoran-0.9.4-orig/saa7111.c driver-zoran-0.9.4-i2c/saa7111.c
--- driver-zoran-0.9.4-orig/saa7111.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/saa7111.c	2003-07-08 18:42:30.000000000 +0200
@@ -542,7 +542,7 @@
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void
 saa7111_inc_use (struct i2c_client *client)
 {
@@ -559,7 +559,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7111 = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner = THIS_MODULE,
 #endif
 	.name = "saa7111",
@@ -570,7 +570,7 @@
 	.attach_adapter = saa7111_attach_adapter,
 	.detach_client = saa7111_detach_client,
 	.command = saa7111_command,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	.inc_use = saa7111_inc_use,
 	.dec_use = saa7111_dec_use,
 #endif
diff -u driver-zoran-0.9.4-orig/saa7114.c driver-zoran-0.9.4-i2c/saa7114.c
--- driver-zoran-0.9.4-orig/saa7114.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/saa7114.c	2003-07-08 18:42:02.000000000 +0200
@@ -1200,7 +1200,7 @@
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void
 saa7114_inc_use (struct i2c_client *client)
 {
@@ -1217,7 +1217,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7114 = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner = THIS_MODULE,
 #endif
 	.name = "saa7114",
@@ -1228,7 +1228,7 @@
 	.attach_adapter = saa7114_attach_adapter,
 	.detach_client = saa7114_detach_client,
 	.command = saa7114_command,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	.inc_use = saa7114_inc_use,
 	.dec_use = saa7114_dec_use,
 #endif
diff -u driver-zoran-0.9.4-orig/saa7185.c driver-zoran-0.9.4-i2c/saa7185.c
--- driver-zoran-0.9.4-orig/saa7185.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/saa7185.c	2003-07-08 18:41:46.000000000 +0200
@@ -487,7 +487,7 @@
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void
 saa7185_inc_use (struct i2c_client *client)
 {
@@ -504,7 +504,7 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7185 = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner = THIS_MODULE,
 #endif
 	.name = "saa7185",	/* name */
@@ -515,7 +515,7 @@
 	.attach_adapter = saa7185_attach_adapter,
 	.detach_client = saa7185_detach_client,
 	.command = saa7185_command,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	.inc_use = saa7185_inc_use,
 	.dec_use = saa7185_dec_use,
 #endif
diff -u driver-zoran-0.9.4-orig/vpx3220.c driver-zoran-0.9.4-i2c/vpx3220.c
--- driver-zoran-0.9.4-orig/vpx3220.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/vpx3220.c	2003-07-08 18:47:20.000000000 +0200
@@ -712,7 +712,7 @@
 	return ret;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 static void
 vpx3220_inc_use (struct i2c_client *client)
 {
@@ -731,7 +731,7 @@
  */
 
 static struct i2c_driver vpx3220_i2c_driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,9)
 	.owner = THIS_MODULE,
 #endif
 	.name = "vpx3220",
@@ -742,7 +742,7 @@
 	.attach_adapter = vpx3220_attach_adapter,
 	.detach_client = vpx3220_detach_client,
 	.command = vpx3220_command,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	.inc_use = vpx3220_inc_use,
 	.dec_use = vpx3220_dec_use,
 #endif
diff -u driver-zoran-0.9.4-orig/zoran_card.c driver-zoran-0.9.4-i2c/zoran_card.c
--- driver-zoran-0.9.4-orig/zoran_card.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/zoran_card.c	2003-07-08 18:35:16.000000000 +0200
@@ -762,6 +762,7 @@
 static struct i2c_adapter zoran_i2c_adapter_template = {
 	.name = "zr36057",
 	.id = I2C_HW_B_ZR36067,
+	.owner = THIS_MODULE,
 	.algo = NULL,
 	.client_register = zoran_i2c_client_register,
 	.client_unregister = zoran_i2c_client_unregister,
diff -u driver-zoran-0.9.4-orig/zoran_driver.c driver-zoran-0.9.4-i2c/zoran_driver.c
--- driver-zoran-0.9.4-orig/zoran_driver.c	2003-03-27 00:03:16.000000000 +0100
+++ driver-zoran-0.9.4-i2c/zoran_driver.c	2003-07-11 18:28:59.000000000 +0200
@@ -1294,9 +1294,11 @@
 	/* try to grab a module lock */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 	MOD_INC_USE_COUNT;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	i2c_inc_use_client(zr->decoder);
 	if (zr->encoder)
 		i2c_inc_use_client(zr->encoder);
+#endif
 #else
 	if (try_module_get(THIS_MODULE)) {
 		dprintk(1,
@@ -1390,9 +1392,11 @@
 	/* if we grabbed locks, release them accordingly */
 	if (have_module_locks) {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 		i2c_dec_use_client(zr->decoder);
 		if (zr->encoder)
 			i2c_dec_use_client(zr->encoder);
+#endif
 		MOD_DEC_USE_COUNT;
 #else
 		module_put(zr->decoder->driver->owner);
@@ -1463,9 +1467,11 @@
 
 	/* release locks on the i2c modules */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
 	i2c_dec_use_client(zr->decoder);
 	if (zr->encoder)
 		i2c_dec_use_client(zr->encoder);
+#endif
 	MOD_DEC_USE_COUNT;
 #else
 	module_put(zr->decoder->driver->owner);