From ab2ae32cff90fb74394c9db09eecfbf33ef0cec4 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Wed, 13 Feb 2008 20:04:49 -0300
Subject: [PATCH] --- yaml --- r: 85760 b: refs/heads/master c:
 83db33a3e5c4200eaf5dec5b4883c0e73f468a3b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/videodev.h  | 1 +
 trunk/include/linux/videodev2.h | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cc31125a51e3..6fb8bd71500a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c018804c0900e7be18507f1eb24e631aa9816ea
+refs/heads/master: 83db33a3e5c4200eaf5dec5b4883c0e73f468a3b
diff --git a/trunk/include/linux/videodev.h b/trunk/include/linux/videodev.h
index 52e3d5fd5be4..9385a566aed8 100644
--- a/trunk/include/linux/videodev.h
+++ b/trunk/include/linux/videodev.h
@@ -12,6 +12,7 @@
 #ifndef __LINUX_VIDEODEV_H
 #define __LINUX_VIDEODEV_H
 
+#include <linux/ioctl.h>
 #include <linux/videodev2.h>
 
 #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h
index 439474f24e34..17a80177a674 100644
--- a/trunk/include/linux/videodev2.h
+++ b/trunk/include/linux/videodev2.h
@@ -62,6 +62,7 @@
 #define __user
 #include <sys/time.h>
 #endif
+#include <linux/ioctl.h>
 #include <linux/types.h>
 
 /*