diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-11-12 18:54:31 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-11-12 18:54:31 -0500 |
| commit | 9589fcde27a6726b83bc525fba5c57e4b2c0328e (patch) | |
| tree | 37e982bbfef2a7e06de373300774e4094bf7016d | |
| parent | a18e2fa5e670a1b84e66522b221c42875b02028a (diff) | |
| parent | 6172180c6b37ea164bf8a9bad70bb348d0a16563 (diff) | |
Merge tag 'topic/drm-fixes-2015-11-11' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Single fix for uapi.
* tag 'topic/drm-fixes-2015-11-11' of git://anongit.freedesktop.org/drm-intel:
drm: Use userspace compatible type in fourcc_mod_code macro
| -rw-r--r-- | include/uapi/drm/drm_fourcc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 8c5e8b91a3cb..0b69a7753558 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h | |||
| @@ -158,7 +158,7 @@ | |||
| 158 | /* add more to the end as needed */ | 158 | /* add more to the end as needed */ |
| 159 | 159 | ||
| 160 | #define fourcc_mod_code(vendor, val) \ | 160 | #define fourcc_mod_code(vendor, val) \ |
| 161 | ((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL)) | 161 | ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL)) |
| 162 | 162 | ||
| 163 | /* | 163 | /* |
| 164 | * Format Modifier tokens: | 164 | * Format Modifier tokens: |