diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-25 07:29:13 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-25 07:29:43 -0200 |
| commit | 333a6515344f5dc4ed0772b8fe252a2246f2e099 (patch) | |
| tree | 17d93325ab3178b65c5f5c98bb0a02e52f513c95 /include/uapi/linux/media.h | |
| parent | 34bbea91125cc2c0e25fe1a52a57af3260666718 (diff) | |
| download | lwn-333a6515344f5dc4ed0772b8fe252a2246f2e099.tar.gz lwn-333a6515344f5dc4ed0772b8fe252a2246f2e099.zip | |
Revert "[media] Postpone the addition of MEDIA_IOC_G_TOPOLOGY"
Enable MEDIA_IOC_G_TOPOLOGY ioctl for Kernel 4.6.
This reverts commit be0270ec89e6b9b49de7e533dd1f3a89ad34d205.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/uapi/linux/media.h')
| -rw-r--r-- | include/uapi/linux/media.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 1e3c8cb43bd7..5dbb208e5451 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -286,7 +286,7 @@ struct media_links_enum { * later, before the adding this API upstream. */ -#if 0 /* Let's postpone it to Kernel 4.6 */ + struct media_v2_entity { __u32 id; char name[64]; /* FIXME: move to a property? (RFC says so) */ @@ -351,7 +351,6 @@ static inline void __user *media_get_uptr(__u64 arg) { return (void __user *)(uintptr_t)arg; } -#endif /* ioctls */ @@ -359,9 +358,6 @@ static inline void __user *media_get_uptr(__u64 arg) #define MEDIA_IOC_ENUM_ENTITIES _IOWR('|', 0x01, struct media_entity_desc) #define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum) #define MEDIA_IOC_SETUP_LINK _IOWR('|', 0x03, struct media_link_desc) - -#if 0 /* Let's postpone it to Kernel 4.6 */ #define MEDIA_IOC_G_TOPOLOGY _IOWR('|', 0x04, struct media_v2_topology) -#endif #endif /* __LINUX_MEDIA_H */ |