diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-07-03 10:50:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-07-03 10:50:21 +0200 |
| commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
| tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /drivers/video/fbdev/mx3fb.c | |
| parent | 516337048fa40496ae5ca9863c367ec991a44d9a (diff) | |
| parent | 4a8f81b8c053aad250ee247b219904ada72df9a4 (diff) | |
| download | kernel_replicant_linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.gz kernel_replicant_linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.bz2 kernel_replicant_linux-341924049558e5f7c1a148a2c461a417933d35d9.zip | |
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'drivers/video/fbdev/mx3fb.c')
| -rw-r--r-- | drivers/video/fbdev/mx3fb.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c index 1c3c7ab26a95..bafd5f5fac5a 100644 --- a/drivers/video/fbdev/mx3fb.c +++ b/drivers/video/fbdev/mx3fb.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2008 * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de> * * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/module.h> |