Skip to content

Commit

Permalink
media: media.h: remove linux/version.h include
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
hverkuil authored and mchehab committed Jul 27, 2018
1 parent 43bd1dc commit 87e1a88
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions drivers/media/media-device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions include/uapi/linux/media.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#endif
#include <linux/ioctl.h>
#include <linux/types.h>
#include <linux/version.h>

struct media_device_info {
char driver[16];
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 87e1a88

Please sign in to comment.