diff options
author | Dave Airlie <airlied@redhat.com> | 2019-02-15 11:21:46 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-02-15 11:21:54 +1000 |
commit | d586d571ca1af63387af1aa758f66391692cb685 (patch) | |
tree | 88340454d467cb2738ca64ae4060adadcd62bdd6 /drivers/gpu/drm/vkms/vkms_output.c | |
parent | cd4c5a48741056266ff19b2516e5355b5a01abf3 (diff) | |
parent | 7fd56e0260a22c0cfaf9adb94a2427b76e239dd0 (diff) |
Merge tag 'drm-misc-fixes-2019-02-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v5.0:
- Fix license inconsistency in vkms.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/812e2f53-d72a-8fba-6c8c-fde8f44cf141@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/vkms/vkms_output.c')
-rw-r--r-- | drivers/gpu/drm/vkms/vkms_output.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c index 271a0eb9042c..4173e4f48334 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -1,10 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ +// SPDX-License-Identifier: GPL-2.0+ #include "vkms_drv.h" #include <drm/drm_crtc_helper.h> |