diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-11-22 11:31:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-11 09:07:52 -0200 |
| commit | dedb94adebe0fbdd9cafdbb170337810d8638bc9 (patch) | |
| tree | cbbeb9f5956d6513771e2a383f3b2ce90537b8fd | |
| parent | b24975c9521497d1d3b1391a42b7f65a87ae99c8 (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>
| -rw-r--r-- | drivers/media/video/timblogiw.c | 3 | ||||
| -rw-r--r-- | drivers/mfd/timberdale.c | 3 | ||||
| -rw-r--r-- | include/media/timb_radio.h | 1 |
3 files changed, 1 insertions, 6 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); diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index 6e53a1650aa1..6ad8a7f8d390 100644 --- a/drivers/mfd/timberdale.c +++ b/drivers/mfd/timberdale.c @@ -258,7 +258,6 @@ static __devinitdata struct timb_video_platform_data .dma_channel = DMA_VIDEO_RX, .i2c_adapter = 0, .encoder = { - .module_name = "adv7180", .info = &timberdale_adv7180_i2c_board_info } }; @@ -289,11 +288,9 @@ static __devinitdata struct timb_radio_platform_data timberdale_radio_platform_data = { .i2c_adapter = 0, .tuner = { - .module_name = "tef6862", .info = &timberdale_tef6868_i2c_board_info }, .dsp = { - .module_name = "saa7706h", .info = &timberdale_saa7706_i2c_board_info } }; diff --git a/include/media/timb_radio.h b/include/media/timb_radio.h index fcd32a3696ba..a59a84854dc1 100644 --- a/include/media/timb_radio.h +++ b/include/media/timb_radio.h @@ -24,7 +24,6 @@ struct timb_radio_platform_data { int i2c_adapter; /* I2C adapter where the tuner and dsp are attached */ struct { - const char *module_name; struct i2c_board_info *info; } tuner; struct { |