diff options
| author | Hans Verkuil <hansverk@cisco.com> | 2018-06-28 09:03:42 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-07-25 07:51:05 -0400 |
| commit | f2399f7522ac2a255f6502537609a51974be84be (patch) | |
| tree | 2dba1e749f0dd2b8f2f3cbc940fd58bc07d82874 /include | |
| parent | 7c8362c4b9eb7e4e9cbebc71ab529dc455c21b6b (diff) | |
| download | linux-stable-f2399f7522ac2a255f6502537609a51974be84be.tar.gz linux-stable-f2399f7522ac2a255f6502537609a51974be84be.tar.bz2 linux-stable-f2399f7522ac2a255f6502537609a51974be84be.zip | |
media: media.h: reorder video en/decoder functions
Keep the function defines in numerical order: 0x6000 comes after
0x2000, so move it back.
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/media.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 6f594fa238c2..76d9bd64c116 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -90,13 +90,6 @@ struct media_device_info { #define MEDIA_ENT_F_LENS (MEDIA_ENT_F_OLD_SUBDEV_BASE + 3) /* - * Video decoder/encoder functions - */ -#define MEDIA_ENT_F_ATV_DECODER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 4) -#define MEDIA_ENT_F_DV_DECODER (MEDIA_ENT_F_BASE + 0x6001) -#define MEDIA_ENT_F_DV_ENCODER (MEDIA_ENT_F_BASE + 0x6002) - -/* * Digital TV, analog TV, radio and/or software defined radio tuner functions. * * It is a responsibility of the master/bridge drivers to add connectors @@ -140,6 +133,13 @@ struct media_device_info { #define MEDIA_ENT_F_VID_MUX (MEDIA_ENT_F_BASE + 0x5001) #define MEDIA_ENT_F_VID_IF_BRIDGE (MEDIA_ENT_F_BASE + 0x5002) +/* + * Video decoder/encoder functions + */ +#define MEDIA_ENT_F_ATV_DECODER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 4) +#define MEDIA_ENT_F_DV_DECODER (MEDIA_ENT_F_BASE + 0x6001) +#define MEDIA_ENT_F_DV_ENCODER (MEDIA_ENT_F_BASE + 0x6002) + /* Entity flags */ #define MEDIA_ENT_FL_DEFAULT (1 << 0) #define MEDIA_ENT_FL_CONNECTOR (1 << 1) |