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 /drivers/misc/mic/scif/scif_epd.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 'drivers/misc/mic/scif/scif_epd.h')
-rw-r--r-- | drivers/misc/mic/scif/scif_epd.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/misc/mic/scif/scif_epd.h b/drivers/misc/mic/scif/scif_epd.h index f39b663da287..d3837f8a5ba0 100644 --- a/drivers/misc/mic/scif/scif_epd.h +++ b/drivers/misc/mic/scif/scif_epd.h @@ -1,19 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Intel MIC Platform Software Stack (MPSS) * * Copyright(c) 2014 Intel Corporation. * - * 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. - * - * 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. - * * Intel SCIF driver. - * */ #ifndef SCIF_EPD_H #define SCIF_EPD_H |