aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2017-08-10 10:08:15 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2017-08-10 10:08:15 +0200
commit7a172d76b5eb606d06f396dc4bce9b71c0b78c03 (patch)
tree509cfa0595a529b56b0ec40ac63e8c0489855e58 /include
parent8824782aaa2d22ca6ca21afb054c189caf3c3531 (diff)
v4l-utils: sync-with-kernel
Updated headers etc. to the latest media_tree master. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/cec-funcs.h1
-rw-r--r--include/linux/media.h5
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/cec-funcs.h b/include/linux/cec-funcs.h
index c451eec4..270b251a 100644
--- a/include/linux/cec-funcs.h
+++ b/include/linux/cec-funcs.h
@@ -895,6 +895,7 @@ static inline void cec_ops_report_features(const struct cec_msg *msg,
*cec_version = msg->msg[2];
*all_device_types = msg->msg[3];
*rc_profile = p;
+ *dev_features = NULL;
while (p < &msg->msg[14] && (*p & CEC_OP_FEAT_EXT))
p++;
if (!(*p & CEC_OP_FEAT_EXT)) {
diff --git a/include/linux/media.h b/include/linux/media.h
index 33323702..91f6539d 100644
--- a/include/linux/media.h
+++ b/include/linux/media.h
@@ -28,8 +28,6 @@
#include <linux/types.h>
#include <linux/version.h>
-#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0)
-
struct media_device_info {
char driver[16];
char model[32];
@@ -174,6 +172,9 @@ struct media_device_info {
#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER MEDIA_ENT_F_ATV_DECODER
#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER MEDIA_ENT_F_TUNER
+/* Obsolete symbol for media_version, no longer used in the kernel */
+#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0)
+
/* Entity flags */
#define MEDIA_ENT_FL_DEFAULT (1 << 0)
#define MEDIA_ENT_FL_CONNECTOR (1 << 1)

Privacy Policy