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/si2165.h | |
parent | tty: cpm_uart: drop unused iflag macro (diff) | |
parent | Linux 5.2-rc3 (diff) | |
download | linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz linux-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/si2165.h')
-rw-r--r-- | drivers/media/dvb-frontends/si2165.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/media/dvb-frontends/si2165.h b/drivers/media/dvb-frontends/si2165.h index 74a57b7ecd26..0b19317f3a31 100644 --- a/drivers/media/dvb-frontends/si2165.h +++ b/drivers/media/dvb-frontends/si2165.h @@ -1,21 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Driver for Silicon Labs SI2165 DVB-C/-T Demodulator * * Copyright (C) 2013-2017 Matthias Schwarzott <zzam@gentoo.org> * - * 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. - * * References: * http://www.silabs.com/Support%20Documents/TechnicalDocs/Si2165-short.pdf - * */ #ifndef _DVB_SI2165_H |