From 06bb90e10cc61113f71422088c39380e946f1e43 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Mar 2011 17:14:33 -0300 Subject: [PATCH] --- yaml --- r: 242045 b: refs/heads/master c: 474966ee01cc877e28abed3ada5b48a963c58695 h: refs/heads/master i: 242043: 5b87a2000248388937b359a928c915375a648d77 v: v3 --- [refs] | 2 +- trunk/Documentation/ioctl/ioctl-number.txt | 1 + trunk/include/linux/media.h | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aefac7dc341a..15c29b0d377e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b0ec19e02fabdd09fc2f4754304894bbefb3f45 +refs/heads/master: 474966ee01cc877e28abed3ada5b48a963c58695 diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt index ac293e955308..2b8c0592b519 100644 --- a/trunk/Documentation/ioctl/ioctl-number.txt +++ b/trunk/Documentation/ioctl/ioctl-number.txt @@ -272,6 +272,7 @@ Code Seq#(hex) Include File Comments 'z' 40-7F CAN bus card conflict! 'z' 10-4F drivers/s390/crypto/zcrypt_api.h conflict! +'|' 00-7F linux/media.h 0x80 00-1F linux/fb.h 0x89 00-06 arch/x86/include/asm/sockios.h 0x89 0B-DF linux/sockios.h diff --git a/trunk/include/linux/media.h b/trunk/include/linux/media.h index 7ed23b43f43b..0ef883327de2 100644 --- a/trunk/include/linux/media.h +++ b/trunk/include/linux/media.h @@ -124,9 +124,9 @@ struct media_links_enum { __u32 reserved[4]; }; -#define MEDIA_IOC_DEVICE_INFO _IOWR('M', 1, struct media_device_info) -#define MEDIA_IOC_ENUM_ENTITIES _IOWR('M', 2, struct media_entity_desc) -#define MEDIA_IOC_ENUM_LINKS _IOWR('M', 3, struct media_links_enum) -#define MEDIA_IOC_SETUP_LINK _IOWR('M', 4, struct media_link_desc) +#define MEDIA_IOC_DEVICE_INFO _IOWR('|', 0x00, struct media_device_info) +#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) #endif /* __LINUX_MEDIA_H */