Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87e1a881 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 43bd1dce

drivers/media/media-device.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/types.h>

#include <linux/pci.h>

#include <linux/usb.h>

#include <linux/version.h>



#include <media/media-device.h>

#include <media/media-devnode.h>

include/uapi/linux/media.h

+1 −2
Original line number Diff line number Diff line
@@ -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