diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-12-08 19:15:30 +0100 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-12-08 19:15:30 +0100 |
| commit | 6647852abc1fd74e9c5e0dcf404ea4cb9c929630 (patch) | |
| tree | 371aa801a5a211f5f8af87bd5488e3dae75ea975 /drivers/gpu/drm/i915/gvt/Makefile | |
| parent | drm/i915: Drop fb reference on load_detect_pipe failure path (diff) | |
| parent | Merge tag 'drm-intel-next-2017-12-01' of git://anongit.freedesktop.org/drm/dr... (diff) | |
| download | linux-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.tar.xz linux-6647852abc1fd74e9c5e0dcf404ea4cb9c929630.zip | |
Merge airlied/drm-next into drm-intel-next-queued
Chris requested this backmerge for a reconciliation on
drm_print.h between drm-misc-next and drm-intel-next-queued
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/Makefile')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile index cae06c1dcdcd..883189694eb6 100644 --- a/drivers/gpu/drm/i915/gvt/Makefile +++ b/drivers/gpu/drm/i915/gvt/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 GVT_DIR := gvt GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \ |