diff options
| author | Mark Brown <broonie@kernel.org> | 2019-06-10 18:52:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-10 18:52:53 +0100 |
| commit | 4343f61103cdb8ccd6f3d5dd7168f1176a1cee37 (patch) | |
| tree | 3db0a2e099cf7feb0c2d60d2a4bf1bf10d5253db /drivers/eisa | |
| parent | aef9752274f4045b0dab577e113da63c96832f77 (diff) | |
| parent | d1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff) | |
Merge tag 'v5.2-rc4' into spi-5.3
Linux 5.2-rc4
Diffstat (limited to 'drivers/eisa')
| -rw-r--r-- | drivers/eisa/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/eisa/eisa-bus.c | 3 | ||||
| -rw-r--r-- | drivers/eisa/pci_eisa.c | 3 | ||||
| -rw-r--r-- | drivers/eisa/virtual_root.c | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/drivers/eisa/Kconfig b/drivers/eisa/Kconfig index 4570e3bca42c..ffc894b4d782 100644 --- a/drivers/eisa/Kconfig +++ b/drivers/eisa/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # EISA configuration # diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c index 1e8062f6dbfc..d9a16ba2ccc2 100644 --- a/drivers/eisa/eisa-bus.c +++ b/drivers/eisa/eisa-bus.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * EISA bus support functions for sysfs. * * (C) 2002, 2003 Marc Zyngier <maz@wild-wind.fr.eu.org> - * - * This code is released under the GPL version 2. */ #include <linux/kernel.h> diff --git a/drivers/eisa/pci_eisa.c b/drivers/eisa/pci_eisa.c index b5f367b44413..930c2332c3c4 100644 --- a/drivers/eisa/pci_eisa.c +++ b/drivers/eisa/pci_eisa.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Minimalist driver for a generic PCI-to-EISA bridge. * * (C) 2003 Marc Zyngier <maz@wild-wind.fr.eu.org> * - * This code is released under the GPL version 2. - * * Ivan Kokshaysky <ink@jurassic.park.msu.ru> : * Generalisation from i82375 to PCI_CLASS_BRIDGE_EISA. */ diff --git a/drivers/eisa/virtual_root.c b/drivers/eisa/virtual_root.c index f1221c1d6319..37e6dd219c37 100644 --- a/drivers/eisa/virtual_root.c +++ b/drivers/eisa/virtual_root.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Virtual EISA root driver. * Acts as a placeholder if we don't have a proper EISA bridge. * * (C) 2003 Marc Zyngier <maz@wild-wind.fr.eu.org> - * - * This code is released under the GPL version 2. */ #include <linux/kernel.h> |