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.
Showing the changes to include/uapi (1 of 1 file). Show all
Unified · Split
| @@ -105,6 +105,7 @@ struct media_device_info { · 104 unmodified lines | ||
| 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 |
| @@ -118,6 +119,7 @@ struct media_device_info { · 7 unmodified lines | ||
| 118 | 119 | #define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2) |
| 119 | 120 | #define MEDIA_ENT_T_DEVNODE_ALSA (MEDIA_ENT_T_DEVNODE + 3) |
| 120 | 121 | #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) |
| 122 | +#endif | |
| 121 | 123 | |
| 122 | 124 | /* Entity types */ |
| 123 | 125 | |