summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-18 11:35:10 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-18 11:35:10 -0300
commit0f2ea07a22d87dcff3529fd787f8b41ed665bb28 (patch)
treed07f4c43fbc9be212164e66e1d03cecec5503674 /linux/drivers/media/video/saa7134/saa7134-video.c
parentd10ad49b94839cf1917bc102be086dc5de329208 (diff)
parent001bc08cc9ccdaf3efc87846858fb8d555e7f9cf (diff)
downloadmediapointer-dvb-s2-0f2ea07a22d87dcff3529fd787f8b41ed665bb28.tar.gz
mediapointer-dvb-s2-0f2ea07a22d87dcff3529fd787f8b41ed665bb28.tar.bz2
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-video.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c
index be7f98bc0..d188aae14 100644
--- a/linux/drivers/media/video/saa7134/saa7134-video.c
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c
@@ -31,11 +31,6 @@
#include "saa7134.h"
#include <media/v4l2-common.h>
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-/* Include V4L1 specific functions. Should be removed soon */
-#include <linux/videodev.h>
-#endif
-
/* ------------------------------------------------------------------ */
unsigned int video_debug;