diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-02-01 18:40:07 +0100 |
---|---|---|
committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-02-01 18:40:07 +0100 |
commit | ab8c609356fbe8dbcd44df11e884ce8cddf3739e (patch) | |
tree | 09b010dc0c31a66227acff4f2a456a4bf4319705 /drivers/pci/hotplug/acpiphp_glue.c | |
parent | Merge remote-tracking branch 'lorenzo/pci/xgene' into next (diff) | |
parent | PCI: Add SPDX GPL-2.0+ to replace implicit GPL v2 or later statement (diff) | |
download | linux-ab8c609356fbe8dbcd44df11e884ce8cddf3739e.tar.xz linux-ab8c609356fbe8dbcd44df11e884ce8cddf3739e.zip |
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/hotplug/acpiphp_glue.c')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 96f5b986454a..e2198a2feeca 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * ACPI PCI HotPlug glue functions to ACPI CA subsystem * @@ -11,21 +12,6 @@ * * All rights reserved. * - * 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, GOOD TITLE or - * NON INFRINGEMENT. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * * Send feedback to <kristen.c.accardi@intel.com> * */ |