aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2021-06-08 14:22:29 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2021-06-08 14:23:41 +0200
commitd54759c5860386e759f830151760a6bdd5b509cf (patch)
treed83ffff7f69e3c8d755cba60e6afa52b6eb5d33a
parent1d13fccac5bf57cc9d54c5f61a32c0c1a2b62399 (diff)
downloadv4l-utils-d54759c5860386e759f830151760a6bdd5b509cf.tar.gz
v4l-utils: sync with media_tree master
This will update v4l2-controls.h, adding _BITUL support Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--contrib/freebsd/include/linux/v4l2-controls.h4
-rw-r--r--include/linux/v4l2-controls.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h
index e329974d..9db08be6 100644
--- a/contrib/freebsd/include/linux/v4l2-controls.h
+++ b/contrib/freebsd/include/linux/v4l2-controls.h
@@ -53,6 +53,10 @@
#include <linux/const.h>
#include <linux/types.h>
+#ifndef _BITUL
+#define _BITUL(x) (1U << (x))
+#endif
+
/* Control classes */
#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
#define V4L2_CTRL_CLASS_CODEC 0x00990000 /* Stateful codec controls */
diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h
index e329974d..9db08be6 100644
--- a/include/linux/v4l2-controls.h
+++ b/include/linux/v4l2-controls.h
@@ -53,6 +53,10 @@
#include <linux/const.h>
#include <linux/types.h>
+#ifndef _BITUL
+#define _BITUL(x) (1U << (x))
+#endif
+
/* Control classes */
#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
#define V4L2_CTRL_CLASS_CODEC 0x00990000 /* Stateful codec controls */