---

yaml --- r: 85760 b: refs/heads/master c: 83db33a h: refs/heads/master v: v3
git-mirror · Feb 18, 2008 · ab2ae32 · ab2ae32
1 parent 71053cf
commit ab2ae32
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -62,6 +62,7 @@
 #define __user
 #include <sys/time.h>
 #endif
+#include <linux/ioctl.h>
 #include <linux/types.h>
 
 /*