drm: Branch 'master'

 include/drm/drm_fourcc.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce3185d3455c7711bffa3762ad32adee2537b773
Author: Tvrtko Ursulin <[email protected]>
Date:   Wed Sep 23 13:33:16 2015 +0100

    libdrm: Use userspace compatible type in fourcc_mod_code macro
    
    __u64 should be used instead of u64.
    
    Kernel headers originally pulled in:
    
    commit 8983fe5497e89a3ffaba3ad1ee06a30a1c7e6daf
    Author: Tvrtko Ursulin <[email protected]>
    Date:   Mon Aug 3 10:48:03 2015 +0100
    
        libdrm: Add framebuffer modifiers uapi
    
    Signed-off-by: Tvrtko Ursulin <[email protected]>
    Cc: [email protected]
    Cc: Rob Clark <[email protected]>
    Cc: Daniel Vetter <[email protected]>
    Signed-off-by: Rob Clark <[email protected]>

diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
index 63a80ca..e741b09 100644
--- a/include/drm/drm_fourcc.h
+++ b/include/drm/drm_fourcc.h
@@ -149,7 +149,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:

------------------------------------------------------------------------------
--