aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-22 12:31:51 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-01 21:09:17 -0200
commit1a24c8e06b15c1b372c435158c329bbba992b941 (patch)
treedf9199f3e648f447b329082be4a5866eb89dd3a0 /drivers
parentba2dbfee128b22f2b16101293d9797b7333ba591 (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')
-rw-r--r--drivers/media/video/timblogiw.c3
-rw-r--r--drivers/mfd/timberdale.c3
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
index 48989e5de1fa..bddcdb6ffef5 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
}
};

Privacy Policy