diff options
| author | Bartlomiej Zolnierkiewicz | 2019-06-19 15:18:48 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2019-06-19 15:18:48 +0200 |
| commit | 2ee692802b8f6c54bd6499addd3d07c2833d84d8 (patch) | |
| tree | 6aa9a7de774804de0d5a944436a380eb99a6ac68 /drivers/video/of_display_timing.c | |
| parent | video: fbdev: pvr2fb: add COMPILE_TEST support (diff) | |
| parent | backlight: simplify lcd notifier (diff) | |
| download | kernel-qcow2-linux-2ee692802b8f6c54bd6499addd3d07c2833d84d8.tar.gz kernel-qcow2-linux-2ee692802b8f6c54bd6499addd3d07c2833d84d8.tar.xz kernel-qcow2-linux-2ee692802b8f6c54bd6499addd3d07c2833d84d8.zip | |
Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
topic/remove-fbcon-notifiers:
- remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking
- assorted locking checks in vt/console code
- assorted notifier and cleanups in fbdev and backlight code
One trivial merge conflict fixed.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/video/of_display_timing.c')
| -rw-r--r-- | drivers/video/of_display_timing.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c index c2e7aa103fa5..f5c1c469c0af 100644 --- a/drivers/video/of_display_timing.c +++ b/drivers/video/of_display_timing.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * OF helpers for parsing display timings * * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix * * based on of_videomode.c by Sascha Hauer <s.hauer@pengutronix.de> - * - * This file is released under the GPLv2 */ #include <linux/export.h> #include <linux/of.h> |