diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-02-01 11:40:07 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-02-01 11:40:07 -0600 |
| commit | ab8c609356fbe8dbcd44df11e884ce8cddf3739e (patch) | |
| tree | 09b010dc0c31a66227acff4f2a456a4bf4319705 /drivers/pci/switch | |
| parent | a5fae846f21d82bb2d41f8726e1b2a4da338b59c (diff) | |
| parent | 36b072742a83ba11241b784a2155dd012c2a5bf4 (diff) | |
Merge branch 'pci/spdx' into next
* pci/spdx:
PCI: Add SPDX GPL-2.0+ to replace implicit GPL v2 or later statement
PCI: Add SPDX GPL-2.0+ to replace GPL v2 or later boilerplate
PCI: Add SPDX GPL-2.0 to replace COPYING boilerplate
PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
PCI: Add SPDX GPL-2.0 when no license was specified
Diffstat (limited to 'drivers/pci/switch')
| -rw-r--r-- | drivers/pci/switch/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pci/switch/Makefile | 1 | ||||
| -rw-r--r-- | drivers/pci/switch/switchtec.c | 11 |
3 files changed, 4 insertions, 10 deletions
diff --git a/drivers/pci/switch/Kconfig b/drivers/pci/switch/Kconfig index 4c49648e0646..aee28a5bb98f 100644 --- a/drivers/pci/switch/Kconfig +++ b/drivers/pci/switch/Kconfig @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + menu "PCI switch controller drivers" depends on PCI diff --git a/drivers/pci/switch/Makefile b/drivers/pci/switch/Makefile index 37d8cfb03f3f..acd56d3b4a35 100644 --- a/drivers/pci/switch/Makefile +++ b/drivers/pci/switch/Makefile @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_PCI_SW_SWITCHTEC) += switchtec.o diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index a0f8373f3b5f..4096c42771a2 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Microsemi Switchtec(tm) PCIe Management Driver * Copyright (c) 2017, Microsemi Corporation - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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. - * */ #include <linux/switchtec.h> |