Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel...

[mv-sheeva.git] / drivers / media / video / saa7134 / saa7134-i2c.c

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index da41b6b1e64a2239569256ca3c7eaffef1b43382..2d3f6d265bbfc18a545b6d667790423cdbfefc9e 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -328,7 +328,6 @@ static struct i2c_algorithm saa7134_algo = {
 static struct i2c_adapter saa7134_adap_template = {
        .owner         = THIS_MODULE,
        .name          = "saa7134",
-       .id            = I2C_HW_SAA7134,
        .algo          = &saa7134_algo,
 };