summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-11-13 09:54:31 +1000
committerDave Airlie <airlied@redhat.com>2015-11-13 09:54:31 +1000
commit9589fcde27a6726b83bc525fba5c57e4b2c0328e (patch)
tree37e982bbfef2a7e06de373300774e4094bf7016d /include
parenta18e2fa5e670a1b84e66522b221c42875b02028a (diff)
parent6172180c6b37ea164bf8a9bad70bb348d0a16563 (diff)
downloadlinux-9589fcde27a6726b83bc525fba5c57e4b2c0328e.tar.gz
linux-9589fcde27a6726b83bc525fba5c57e4b2c0328e.tar.bz2
linux-9589fcde27a6726b83bc525fba5c57e4b2c0328e.zip
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
Diffstat (limited to 'include')
-rw-r--r--include/uapi/drm/drm_fourcc.h2
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 @@
/* add more to the end as needed */
#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: