summaryrefslogtreecommitdiff
path: root/linux/include/media/v4l2-ioctl.h
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/include/media/v4l2-ioctl.h
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/include/media/v4l2-ioctl.h')
-rw-r--r--linux/include/media/v4l2-ioctl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/include/media/v4l2-ioctl.h b/linux/include/media/v4l2-ioctl.h
index a8b4c0b67..7a4529def 100644
--- a/linux/include/media/v4l2-ioctl.h
+++ b/linux/include/media/v4l2-ioctl.h
@@ -15,6 +15,7 @@
#include <linux/mutex.h>
#include <linux/compiler.h> /* need __user */
#ifdef CONFIG_VIDEO_V4L1_COMPAT
+#define __MIN_V4L1
#include <linux/videodev.h>
#else
#include <linux/videodev2.h>