Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] media.h: don't use legacy entity macros at Kernel

Put the legacy MEDIA_ENT_* macros under a #ifndef __KERNEL__,
in order to be sure that none of those old symbols are used
inside the Kernel.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

+2
+2
include/uapi/linux/media.h
··· 105 105 #define MEDIA_ENT_T_DVB_CA (MEDIA_ENT_T_DVB_BASE + 4) 106 106 #define MEDIA_ENT_T_DVB_NET_DECAP (MEDIA_ENT_T_DVB_BASE + 5) 107 107 108 + #ifndef __KERNEL__ 108 109 /* Legacy symbols used to avoid userspace compilation breakages */ 109 110 #define MEDIA_ENT_TYPE_SHIFT 16 110 111 #define MEDIA_ENT_TYPE_MASK 0x00ff0000 ··· 119 118 #define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2) 120 119 #define MEDIA_ENT_T_DEVNODE_ALSA (MEDIA_ENT_T_DEVNODE + 3) 121 120 #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) 121 + #endif 122 122 123 123 /* Entity types */ 124 124