diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
commit | 888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch) | |
tree | 0c2154dfa92ca6ee761c358e58a3e35831558bb5 /drivers/media/dvb-frontends/cx24120.h | |
parent | tty: cpm_uart: drop unused iflag macro (diff) | |
parent | Linux 5.2-rc3 (diff) | |
download | linux-dev-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz linux-dev-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.zip |
Merge 5.2-rc3 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/dvb-frontends/cx24120.h')
-rw-r--r-- | drivers/media/dvb-frontends/cx24120.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/media/dvb-frontends/cx24120.h b/drivers/media/dvb-frontends/cx24120.h index de4ca9aa0923..371b1d3d55ac 100644 --- a/drivers/media/dvb-frontends/cx24120.h +++ b/drivers/media/dvb-frontends/cx24120.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Conexant CX24120/CX24118 - DVB-S/S2 demod/tuner driver * @@ -5,16 +6,6 @@ * Copyright (C) 2009 Sergey Tyurin <forum.free-x.de> * Updated 2012 by Jannis Achstetter <jannis_achstetter@web.de> * Copyright (C) 2015 Jemma Denson <jdenson@gmail.com> - * - * 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. - * - * 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. */ #ifndef CX24120_H |