diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 10:49:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 10:49:39 -0300 |
| commit | 3d8bb4537fe9a985d386b7a51ee0c1f11d25a095 (patch) | |
| tree | aff679c0dffa6a6365ee183b3a21b8e46c90f689 /linux/drivers/media/video/davinci/vpif_display.c | |
| parent | 856378592a1b9be61e28092caf5e87446bae4694 (diff) | |
| parent | 0f8f6ec6e6b142a0398c9a0d9925432326d0b595 (diff) | |
| download | mediapointer-dvb-s2-3d8bb4537fe9a985d386b7a51ee0c1f11d25a095.tar.gz mediapointer-dvb-s2-3d8bb4537fe9a985d386b7a51ee0c1f11d25a095.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/davinci/vpif_display.c')
| -rw-r--r-- | linux/drivers/media/video/davinci/vpif_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/davinci/vpif_display.c b/linux/drivers/media/video/davinci/vpif_display.c index 0f0ec8dc6..a125a452d 100644 --- a/linux/drivers/media/video/davinci/vpif_display.c +++ b/linux/drivers/media/video/davinci/vpif_display.c @@ -1422,7 +1422,7 @@ vpif_init_free_channel_objects: */ static __init int vpif_probe(struct platform_device *pdev) { - const struct subdev_info *subdevdata; + const struct vpif_subdev_info *subdevdata; int i, j = 0, k, q, m, err = 0; struct i2c_adapter *i2c_adap; struct vpif_config *config; |