diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-13 03:24:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-13 03:24:47 +0100 |
| commit | f6d07dfcb15aad199d7351d3122eabd506968daf (patch) | |
| tree | 7f76fb2b9c2d1966ed0bac068fead768eba3c56e /include | |
| parent | Merge tag 'trace-v4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ros... (diff) | |
| parent | Revert "drm/rockchip: Convert the probe function to the generic drm_of_compon... (diff) | |
| download | linux-f6d07dfcb15aad199d7351d3122eabd506968daf.tar.xz linux-f6d07dfcb15aad199d7351d3122eabd506968daf.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"One urgent fix for an oops under console lock in some drivers, one
uapi fix, and one revert to fix rockchip regression"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
Revert "drm/rockchip: Convert the probe function to the generic drm_of_component_probe()"
drm: Don't oops in drm_calc_timestamping_constants() if drm_vblank_init() wasn't called
drm: Use userspace compatible type in fourcc_mod_code macro
Diffstat (limited to 'include')
| -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 @@ /* 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: |