aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-22 11:31:51 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-11 09:07:52 -0200
commitdedb94adebe0fbdd9cafdbb170337810d8638bc9 (patch)
treecbbeb9f5956d6513771e2a383f3b2ce90537b8fd /drivers/media
parentb24975c9521497d1d3b1391a42b7f65a87ae99c8 (diff)
[media] timblogiw: Fix a merge conflict with v4l2_i2c_new_subdev_board changes
v4l2_i2c_new_subdev_board() doesn't need the module name anymore. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/timblogiw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
index 93867893f68a..cf48aa934b8c 100644
--- a/drivers/media/video/timblogiw.c
+++ b/drivers/media/video/timblogiw.c
@@ -638,8 +638,7 @@ static int timblogiw_open(struct file *file)
/* now find the encoder */
lw->sd_enc = v4l2_i2c_new_subdev_board(&lw->v4l2_dev, adapt,
- lw->pdata.encoder.module_name, lw->pdata.encoder.info,
- NULL);
+ lw->pdata.encoder.info, NULL);
i2c_put_adapter(adapt);

Privacy Policy