diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 13:32:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 13:32:57 -0300 |
| commit | ea5644051e25a55f6a8a02e5c9d22e06dc318307 (patch) | |
| tree | 32e688148fa7252ab029d2da4e6041ba54545157 /linux/drivers/media | |
| parent | c04ff5d532d9ae99a06936a894a293a3fc806f6a (diff) | |
| download | mediapointer-dvb-s2-ea5644051e25a55f6a8a02e5c9d22e06dc318307.tar.gz mediapointer-dvb-s2-ea5644051e25a55f6a8a02e5c9d22e06dc318307.tar.bz2 | |
backport upstream changes for arch
From: Mauro Carvalho Chehab <mchehab@redhat.com>
It also backports a needed change at vpif_display, applied at -git to fix
compilation against the arm drivers.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
| -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; |