This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: (k)FreeBSD: Fix videodev2 header Author: Gregor Jasny <[email protected]> Date: Mon Oct 8 21:20:01 2012 +0200 Signed-off-by: Gregor Jasny <[email protected]> contrib/freebsd/include/linux/videodev2.h | 4 +--- contrib/freebsd/patches/videodev2-header.diff | 17 ++++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=df5eae448eed118db57f1c4f08794a1e71f1f0d7 diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 887aa0a..9198b9e 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -89,9 +89,7 @@ typedef int16_t __s16; typedef int8_t __s8; #endif #endif -#include <linux/compiler.h> -#include <linux/ioctl.h> -#include <linux/types.h> + #include <linux/v4l2-common.h> #include <linux/v4l2-controls.h> diff --git a/contrib/freebsd/patches/videodev2-header.diff b/contrib/freebsd/patches/videodev2-header.diff index 8eb3c8f..8e43677 100644 --- a/contrib/freebsd/patches/videodev2-header.diff +++ b/contrib/freebsd/patches/videodev2-header.diff @@ -1,8 +1,6 @@ -diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h -index 61395ef..59b4bec 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h -@@ -56,10 +56,38 @@ +@@ -56,14 +56,40 @@ #ifndef __LINUX_VIDEODEV2_H #define __LINUX_VIDEODEV2_H @@ -31,7 +29,10 @@ index 61395ef..59b4bec 100644 + +#ifndef __s64 +typedef int64_t __s64; -+#endif + #endif +-#include <linux/compiler.h> +-#include <linux/ioctl.h> +-#include <linux/types.h> +#ifndef __s32 +typedef int32_t __s32; +#endif @@ -41,6 +42,8 @@ index 61395ef..59b4bec 100644 +#ifndef __s8 +typedef int8_t __s8; +#endif - #endif - #include <linux/compiler.h> - #include <linux/ioctl.h> ++#endif ++ + #include <linux/v4l2-common.h> + #include <linux/v4l2-controls.h> + _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
