diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 20:37:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 20:37:28 -0800 |
| commit | ae36ce07abbdde3521dc0ef7e32143b88718cd21 (patch) | |
| tree | 197976433d076525dbb35f0a246d565787ed9c96 /Makefile | |
| parent | 2df4ee78d042ee3d17cbebd51e31b300286549dc (diff) | |
| parent | 10855aeb1e78533c041065b33e34315e1f381c2e (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Two build fixes, one for VC4, one for nouveau where the ARM only code
is doing something a bit strange. While people are discussing that,
just workaround it and fix the build for now. The code in question
will never get used on anything non-ARM anyways.
Also one fix for AST that SuSE had been hiding in their kernel, that
allows all fbdev apps to work on that driver"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau: fix build failures on all non ARM.
drm/ast: Initialized data needed to map fbdev memory
drm/vc4: Add dependency on HAVE_DMA_ATTRS, and select DRM_GEM_CMA_HELPER
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions