diff options
| author | David S. Miller | 2019-06-07 20:00:14 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-06-07 20:00:14 +0200 |
| commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
| tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /include/linux/mfd/mxs-lradc.h | |
| parent | Merge branch 'Xilinx-axienet-driver-updates' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.gz kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.xz kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mfd/mxs-lradc.h')
| -rw-r--r-- | include/linux/mfd/mxs-lradc.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/mfd/mxs-lradc.h b/include/linux/mfd/mxs-lradc.h index 661a4521f723..ada3d81ee277 100644 --- a/include/linux/mfd/mxs-lradc.h +++ b/include/linux/mfd/mxs-lradc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale MXS Low Resolution Analog-to-Digital Converter driver * @@ -5,16 +6,6 @@ * Copyright (c) 2016 Ksenija Stanojevic <ksenija.stanojevic@gmail.com> * * Author: Marek Vasut <marex@denx.de> - * - * 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 __MFD_MXS_LRADC_H |