Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

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

diff --git a/drivers/media/video/cx231xx/cx231xx-i2c.c b/drivers/media/video/cx231xx/cx231xx-i2c.c
index 33219dc4d64987e640f109f853ec6a8b30159cc7..58d9cc0867b9a43bcc7240e8e578041cadbe87e0 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-i2c.c
+++ b/drivers/media/video/cx231xx/cx231xx-i2c.c
@@ -432,7 +432,6 @@ static struct i2c_algorithm cx231xx_algo = {
 static struct i2c_adapter cx231xx_adap_template = {
        .owner = THIS_MODULE,
        .name = "cx231xx",
-       .id = I2C_HW_B_CX231XX,
        .algo = &cx231xx_algo,
 };