From cfa998fdc68d5437a8d6b27c9c0e829a4eb78aa0 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 10 Mar 2009 18:30:27 -0300
Subject: [PATCH] --- yaml --- r: 138157 b: refs/heads/master c:
 5e585ef15b3633e1b0c022aa14bc88587827acd3 h: refs/heads/master i:   138155:
 4fc5182f56ce2965c9d00d2e6d0fd68ae2cb84e7 v: v3

---
 [refs]                              | 2 +-
 trunk/include/media/videobuf-core.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1318cf22ceed..898a428ad184 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0290152c0f0f4a1c3d6e2b6064780d0cc288d8a4
+refs/heads/master: 5e585ef15b3633e1b0c022aa14bc88587827acd3
diff --git a/trunk/include/media/videobuf-core.h b/trunk/include/media/videobuf-core.h
index 874f1340d049..1c5946c44758 100644
--- a/trunk/include/media/videobuf-core.h
+++ b/trunk/include/media/videobuf-core.h
@@ -18,6 +18,7 @@
 
 #include <linux/poll.h>
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
+#define __MIN_V4L1
 #include <linux/videodev.h>
 #endif
 #include <linux/videodev2.h>