aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/timberdale.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-22 14:31:51 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-11 11:07:52 (GMT)
commitdedb94adebe0fbdd9cafdbb170337810d8638bc9 (patch)
treecbbeb9f5956d6513771e2a383f3b2ce90537b8fd /drivers/mfd/timberdale.c
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/mfd/timberdale.c')
-rw-r--r--drivers/mfd/timberdale.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 6e53a16..6ad8a7f 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