diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/adv7170.c linux-2.6-6-rc3-mm2/drivers/media/video/adv7170.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/adv7170.c 2004-05-09 11:03:04.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/adv7170.c 2004-05-09 11:28:12.000000000 +0200 @@ -516,6 +516,7 @@ .id = I2C_DRIVERID_ADV7170, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = adv7170_attach_adapter, .detach_client = adv7170_detach_client, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/adv7175.c linux-2.6-6-rc3-mm2/drivers/media/video/adv7175.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/adv7175.c 2004-05-09 11:03:04.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/adv7175.c 2004-05-09 11:27:55.000000000 +0200 @@ -538,6 +538,7 @@ .id = I2C_DRIVERID_ADV7175, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = adv7175_attach_adapter, .detach_client = adv7175_detach_client, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/bt819.c linux-2.6-6-rc3-mm2/drivers/media/video/bt819.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/bt819.c 2004-05-09 11:03:03.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/bt819.c 2004-05-09 11:24:22.000000000 +0200 @@ -642,6 +642,7 @@ .id = I2C_DRIVERID_BT819, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = bt819_attach_adapter, .detach_client = bt819_detach_client, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/bt856.c linux-2.6-6-rc3-mm2/drivers/media/video/bt856.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/bt856.c 2004-05-09 11:03:03.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/bt856.c 2004-05-09 11:23:22.000000000 +0200 @@ -423,6 +423,7 @@ .id = I2C_DRIVERID_BT856, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = bt856_attach_adapter, .detach_client = bt856_detach_client, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7110.c linux-2.6-6-rc3-mm2/drivers/media/video/saa7110.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7110.c 2004-05-09 11:03:03.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/saa7110.c 2004-05-09 11:22:57.000000000 +0200 @@ -599,6 +599,7 @@ .id = I2C_DRIVERID_SAA7110, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = saa7110_attach_adapter, .detach_client = saa7110_detach_client, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7111.c linux-2.6-6-rc3-mm2/drivers/media/video/saa7111.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7111.c 2004-05-09 11:06:43.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/saa7111.c 2004-05-09 11:24:54.000000000 +0200 @@ -608,7 +608,8 @@ .id = I2C_DRIVERID_SAA7111A, .flags = I2C_DF_NOTIFY, - + .class = I2C_CLASS_TV_ANALOG, + .attach_adapter = saa7111_attach_adapter, .detach_client = saa7111_detach_client, .command = saa7111_command, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7114.c linux-2.6-6-rc3-mm2/drivers/media/video/saa7114.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7114.c 2004-05-09 11:03:04.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/saa7114.c 2004-05-09 11:27:15.000000000 +0200 @@ -1222,6 +1222,7 @@ .id = I2C_DRIVERID_SAA7114, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = saa7114_attach_adapter, .detach_client = saa7114_detach_client, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7185.c linux-2.6-6-rc3-mm2/drivers/media/video/saa7185.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/saa7185.c 2004-05-09 11:03:03.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/saa7185.c 2004-05-09 11:23:55.000000000 +0200 @@ -505,6 +505,7 @@ .id = I2C_DRIVERID_SAA7185B, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = saa7185_attach_adapter, .detach_client = saa7185_detach_client, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tda9840.c linux-2.6-6-rc3-mm2/drivers/media/video/tda9840.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tda9840.c 2004-05-09 11:03:03.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tda9840.c 2004-05-09 11:26:35.000000000 +0200 @@ -263,6 +263,7 @@ .name = "tda9840 driver", .id = I2C_DRIVERID_TDA9840, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = tda9840_attach, .detach_client = tda9840_detach, .command = tda9840_command, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tea6415c.c linux-2.6-6-rc3-mm2/drivers/media/video/tea6415c.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tea6415c.c 2004-05-09 11:03:03.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tea6415c.c 2004-05-09 11:26:52.000000000 +0200 @@ -212,6 +212,7 @@ .name = "tea6415c driver", .id = I2C_DRIVERID_TEA6415C, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = tea6415c_attach, .detach_client = tea6415c_detach, .command = tea6415c_command, diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tea6420.c linux-2.6-6-rc3-mm2/drivers/media/video/tea6420.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tea6420.c 2004-05-09 11:03:03.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tea6420.c 2004-05-09 11:26:09.000000000 +0200 @@ -192,8 +192,9 @@ .name = "tea6420 driver", .id = I2C_DRIVERID_TEA6420, .flags = I2C_DF_NOTIFY, - .attach_adapter = tea6420_attach, + .class = I2C_CLASS_TV_ANALOG, + .attach_adapter = tea6420_attach, .detach_client = tea6420_detach, .command = tea6420_command, }; diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/tuner-3036.c linux-2.6-6-rc3-mm2/drivers/media/video/tuner-3036.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/tuner-3036.c 2004-05-09 11:03:03.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/tuner-3036.c 2004-05-09 11:25:25.000000000 +0200 @@ -185,6 +185,7 @@ .name = "sab3036", .id = I2C_DRIVERID_SAB3036, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = tuner_probe, .detach_client = tuner_detach, .command = tuner_command @@ -200,8 +201,7 @@ int __init tuner3036_init(void) { - i2c_add_driver(&i2c_driver_tuner); - return 0; + return i2c_add_driver(&i2c_driver_tuner); } void __exit diff -ura xx-linux-2.6-6-rc3-mm2/drivers/media/video/vpx3220.c linux-2.6-6-rc3-mm2/drivers/media/video/vpx3220.c --- xx-linux-2.6-6-rc3-mm2/drivers/media/video/vpx3220.c 2004-05-09 11:03:03.000000000 +0200 +++ linux-2.6-6-rc3-mm2/drivers/media/video/vpx3220.c 2004-05-09 11:27:33.000000000 +0200 @@ -731,6 +731,7 @@ .id = I2C_DRIVERID_VPX3220, .flags = I2C_DF_NOTIFY, + .class = I2C_CLASS_TV_ANALOG, .attach_adapter = vpx3220_attach_adapter, .detach_client = vpx3220_detach_client,