diff --git a/[refs] b/[refs] index 540434a31add..d67919a539a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c84674353a8c344d169aabce4dc4d44daaa270d +refs/heads/master: acebc70d4a789df21270690c70928b8a836caad7 diff --git a/trunk/drivers/media/video/tda9840.c b/trunk/drivers/media/video/tda9840.c index fe1158094c24..d381fce3db40 100644 --- a/trunk/drivers/media/video/tda9840.c +++ b/trunk/drivers/media/video/tda9840.c @@ -192,7 +192,6 @@ static int tda9840_remove(struct i2c_client *client) return 0; } - static const struct i2c_device_id tda9840_id[] = { { "tda9840", 0 }, { } diff --git a/trunk/drivers/media/video/tea6415c.c b/trunk/drivers/media/video/tea6415c.c index d61c56f42bcd..ff696d14a5dd 100644 --- a/trunk/drivers/media/video/tea6415c.c +++ b/trunk/drivers/media/video/tea6415c.c @@ -170,7 +170,6 @@ static int tea6415c_remove(struct i2c_client *client) return 0; } - static const struct i2c_device_id tea6415c_id[] = { { "tea6415c", 0 }, { } diff --git a/trunk/drivers/media/video/tea6420.c b/trunk/drivers/media/video/tea6420.c index 34922232402a..8a55b46ea9b7 100644 --- a/trunk/drivers/media/video/tea6420.c +++ b/trunk/drivers/media/video/tea6420.c @@ -156,7 +156,6 @@ static int tea6420_remove(struct i2c_client *client) return 0; } - static const struct i2c_device_id tea6420_id[] = { { "tea6420", 0 }, { } diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c index cc5f018b8eb4..78c377a399cb 100644 --- a/trunk/drivers/media/video/tuner-core.c +++ b/trunk/drivers/media/video/tuner-core.c @@ -1164,7 +1164,6 @@ static int tuner_probe(struct i2c_client *client, return 0; } - static int tuner_remove(struct i2c_client *client) { struct tuner *t = to_tuner(i2c_get_clientdata(client)); diff --git a/trunk/drivers/media/video/tvaudio.c b/trunk/drivers/media/video/tvaudio.c index 2a49c839f8ac..17d50e3cd518 100644 --- a/trunk/drivers/media/video/tvaudio.c +++ b/trunk/drivers/media/video/tvaudio.c @@ -2069,7 +2069,6 @@ static int tvaudio_remove(struct i2c_client *client) return 0; } - /* This driver supports many devices and the idea is to let the driver detect which device is present. So rather than listing all supported devices here, we pretend to support a single, fake device type. */ diff --git a/trunk/include/media/v4l2-i2c-drv.h b/trunk/include/media/v4l2-i2c-drv.h index 1ceeb9cfc8a8..10a2882c3cbf 100644 --- a/trunk/include/media/v4l2-i2c-drv.h +++ b/trunk/include/media/v4l2-i2c-drv.h @@ -51,7 +51,7 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data; static struct i2c_driver v4l2_i2c_driver; -/* Bus-based I2C implementation for kernels >= 2.6.22 */ +/* Bus-based I2C implementation for kernels >= 2.6.26 */ static int __init v4l2_i2c_drv_init(void) {