summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2018-07-25 14:51:39 +0200
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-07-27 13:52:39 +0200
commit87e1a881e1fe3bfd89903c54ae0d6d6adedb76f1 (patch)
tree8ab9422be364e1a0041d97790395c31a2a7b0e9b /include
parentmedia: vivid: Fix V4L2_FIELD_ALTERNATE new frame check (diff)
downloadlinux-87e1a881e1fe3bfd89903c54ae0d6d6adedb76f1.tar.xz
linux-87e1a881e1fe3bfd89903c54ae0d6d6adedb76f1.zip
media: media.h: remove linux/version.h include
The media.h public header is one of only three public headers that include linux/version.h. Drop it from media.h. It was only used for an obsolete define. It has to be added to media-device.c, since that source relied on media.h to include it. Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/media.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 82ec9f132a53..36f76e777ef9 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -25,7 +25,6 @@
#endif
#include <linux/ioctl.h>
#include <linux/types.h>
-#include <linux/version.h>
struct media_device_info {
char driver[16];
@@ -421,7 +420,7 @@ struct media_v2_topology {
#define MEDIA_INTF_T_ALSA_TIMER (MEDIA_INTF_T_ALSA_BASE + 7)
/* Obsolete symbol for media_version, no longer used in the kernel */
-#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0)
+#define MEDIA_API_VERSION ((0 << 16) | (1 << 8) | 0)
#endif