Commit 9589fcde authored by Dave Airlie's avatar Dave Airlie

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
parents a18e2fa5 6172180c
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
/* add more to the end as needed */ /* add more to the end as needed */
#define fourcc_mod_code(vendor, val) \ #define fourcc_mod_code(vendor, val) \
((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL)) ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
/* /*
* Format Modifier tokens: * Format Modifier tokens:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment