diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
| commit | 92ad6325cb891bb455487bfe90cc47d18aa6ec37 (patch) | |
| tree | 433a7ef938fae69789216043f67eff9f9c6b0c68 /drivers/media/platform/ti-vpe/sc.c | |
| parent | e0effb5fbd56a8b2b8917611cbf4fcd9aba92b8f (diff) | |
| parent | c356dc4b540edd6c02b409dd8cf3208ba2804c38 (diff) | |
| download | linux-92ad6325cb891bb455487bfe90cc47d18aa6ec37.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor SPDX change conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/platform/ti-vpe/sc.c')
| -rw-r--r-- | drivers/media/platform/ti-vpe/sc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti-vpe/sc.c index e9273b713782..98f95082a6fd 100644 --- a/drivers/media/platform/ti-vpe/sc.c +++ b/drivers/media/platform/ti-vpe/sc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Scaler library * @@ -6,10 +7,6 @@ * David Griego, <dagriego@biglakesoftware.com> * Dale Farnsworth, <dale@farnsworth.org> * Archit Taneja, <archit@ti.com> - * - * 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/err.h> |