diff --git a/[refs] b/[refs] index 4feacb3050eb..4cbef0df6950 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d63cb45a2ee5cbf2e6d568fb2c4007a52e21bcf +refs/heads/master: c06f57f55a0e499ec38fbb62812ad3fe08ad246e diff --git a/trunk/drivers/media/video/em28xx/em28xx-i2c.c b/trunk/drivers/media/video/em28xx/em28xx-i2c.c index f1493c48656b..d6ae2e397c5e 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-i2c.c +++ b/trunk/drivers/media/video/em28xx/em28xx-i2c.c @@ -329,8 +329,6 @@ static int attach_inform(struct i2c_client *client) } static struct i2c_algorithm em2820_algo = { - .name = "em2820", - .id = I2C_HW_B_EM2820, .master_xfer = em2820_i2c_xfer, .algo_control = algo_control, .functionality = functionality,