aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/timb_radio.h
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 /include/media/timb_radio.h
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 'include/media/timb_radio.h')
-rw-r--r--include/media/timb_radio.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/media/timb_radio.h b/include/media/timb_radio.h
index fcd32a3..a59a848 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 {

Privacy Policy