diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-29 10:36:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-29 10:36:06 +1000 |
| commit | 095e2d04f9fa88a7c6923734ab4162833ff4f230 (patch) | |
| tree | ff1496efcbbe72839cb9705c5de1ea32f3c02dec /include/uapi | |
| parent | ffa9443fb3d3eddf0fdf6ac473dc8b5c87f08f15 (diff) | |
| parent | f44d85389e17b2e960620c1c6d89bda978a11f2b (diff) | |
| download | linux-095e2d04f9fa88a7c6923734ab4162833ff4f230.tar.bz2 | |
Merge tag 'drm-misc-next-fixes-2017-08-28' of git://anongit.freedesktop.org/git/drm-misc into drm-next
UAPI Changes:
- Rename u32 to __u32 in struct drm_format_modifier_blob (Lionel)
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
* tag 'drm-misc-next-fixes-2017-08-28' of git://anongit.freedesktop.org/git/drm-misc:
drm: rename u32 in __u32 in uapi
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/drm_mode.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index a2bb7161f020..54fc38c3c3f1 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -715,24 +715,24 @@ struct drm_mode_atomic { struct drm_format_modifier_blob { #define FORMAT_BLOB_CURRENT 1 /* Version of this blob format */ - u32 version; + __u32 version; /* Flags */ - u32 flags; + __u32 flags; /* Number of fourcc formats supported */ - u32 count_formats; + __u32 count_formats; /* Where in this blob the formats exist (in bytes) */ - u32 formats_offset; + __u32 formats_offset; /* Number of drm_format_modifiers */ - u32 count_modifiers; + __u32 count_modifiers; /* Where in this blob the modifiers exist (in bytes) */ - u32 modifiers_offset; + __u32 modifiers_offset; - /* u32 formats[] */ + /* __u32 formats[] */ /* struct drm_format_modifier modifiers[] */ }; |