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/host/pci-aardvark.c | |
| parent | a5fae846f21d82bb2d41f8726e1b2a4da338b59c (diff) | |
| parent | 36b072742a83ba11241b784a2155dd012c2a5bf4 (diff) | |
| download | linux-ab8c609356fbe8dbcd44df11e884ce8cddf3739e.tar.gz linux-ab8c609356fbe8dbcd44df11e884ce8cddf3739e.tar.xz | |
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/host/pci-aardvark.c')
| -rw-r--r-- | drivers/pci/host/pci-aardvark.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index 26ed0c08f209..b04d37b3c5de 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for the Aardvark PCIe controller, used on Marvell Armada * 3700. @@ -5,10 +6,6 @@ * Copyright (C) 2016 Marvell * * Author: Hezi Shahmoon <hezi.shahmoon@marvell.com> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #include <linux/delay.h> |