summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/vt8500lcdfb.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2019-06-19 12:04:55 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2019-06-19 12:07:29 +0200
commit52d2d44eee8091e740d0d275df1311fb8373c9a9 (patch)
tree4aff282e84b3469f18cf9717490b892f6f39198f /drivers/video/fbdev/vt8500lcdfb.c
parentMerge tag 'drm-misc-next-2019-06-14' of git://anongit.freedesktop.org/drm/drm... (diff)
parentLinux 5.2-rc5 (diff)
downloadlinux-52d2d44eee8091e740d0d275df1311fb8373c9a9.tar.xz
linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.zip
Merge v5.2-rc5 into drm-next
Maarten needs -rc4 backmerged so he can pull in the fbcon notifier removal topic branch into drm-misc-next. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/video/fbdev/vt8500lcdfb.c')
-rw-r--r--drivers/video/fbdev/vt8500lcdfb.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/video/fbdev/vt8500lcdfb.c b/drivers/video/fbdev/vt8500lcdfb.c
index 5c5cd2923041..be8d9702cbb2 100644
--- a/drivers/video/fbdev/vt8500lcdfb.c
+++ b/drivers/video/fbdev/vt8500lcdfb.c
@@ -1,18 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* linux/drivers/video/vt8500lcdfb.c
*
* Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
*
* Based on skeletonfb.c and pxafb.c
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*/
#include <linux/delay.h>