From 429eab260447c77e3e7ef6cb15df4df91622d1b5 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 17 Jun 2006 07:57:03 -0300
Subject: [PATCH] --- yaml --- r: 30008 b: refs/heads/master c:
 89a58c83f8f1056583f30c4d4258b1fec39bb0e2 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/videodev2.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ccf07dc4b278..6c46e62d9d5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dab71b1e85356fdd7cbc29d338ca6c0bd0e4e49
+refs/heads/master: 89a58c83f8f1056583f30c4d4258b1fec39bb0e2
diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h
index bc957d83a127..9a70c5654ceb 100644
--- a/trunk/include/linux/videodev2.h
+++ b/trunk/include/linux/videodev2.h
@@ -15,10 +15,12 @@
 #ifndef __LINUX_VIDEODEV2_H
 #define __LINUX_VIDEODEV2_H
 #ifdef __KERNEL__
-#include <linux/time.h> /* need struct timeval */
+#include <linux/time.h>     /* need struct timeval */
+#include <linux/compiler.h> /* need __user */
+#else
+#define __user
 #endif
 #include <linux/types.h>
-#include <linux/compiler.h> /* need __user */
 
 #define HAVE_V4L2 1