summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/virtio/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-08 03:11:56 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-08 03:11:56 +0100
commit0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch)
treef0aa64e956d1d2addb2263ddcd238e9f014b36a0 /drivers/gpu/drm/virtio/Makefile
parentInput: convert autorepeat timer to use timer_setup() (diff)
parentLinux 4.14-rc8 (diff)
downloadlinux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.xz
linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.zip
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge problems when some header files get deleted.
Diffstat (limited to 'drivers/gpu/drm/virtio/Makefile')
-rw-r--r--drivers/gpu/drm/virtio/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/virtio/Makefile b/drivers/gpu/drm/virtio/Makefile
index 7684f613bdc3..f29deec83d1f 100644
--- a/drivers/gpu/drm/virtio/Makefile
+++ b/drivers/gpu/drm/virtio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the drm device driver. This driver provides support for the
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.