aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-11-09 09:05:11 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-11-26 19:38:04 -0200
commit934949d816004ff66e21adbab225e9cb7f20015a (patch)
treeeaf4d22a1c578ec66b74d8b0e9cfa69669c0f2f0 /drivers/media
parentV4L/DVB (13366): em28xx: fix Reddo DVB-C USB TV Box GPIO (diff)
downloadlinux-dev-934949d816004ff66e21adbab225e9cb7f20015a.tar.xz
linux-dev-934949d816004ff66e21adbab225e9cb7f20015a.zip
V4L/DVB (13371): davinci: remove stray duplicate config pointer
The vpif_config struct was renamed to vpif_display_config, but there is still a stray vpif_config *config pointer in vpif_display.c, preventing it from compiling. Remove this old duplicate pointer. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/davinci/vpif_display.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index c015da813dda..d14cfb200ed0 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -1426,7 +1426,6 @@ static __init int vpif_probe(struct platform_device *pdev)
struct vpif_display_config *config;
int i, j = 0, k, q, m, err = 0;
struct i2c_adapter *i2c_adap;
- struct vpif_config *config;
struct common_obj *common;
struct channel_obj *ch;
struct video_device *vfd;