diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
| commit | 888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch) | |
| tree | 0c2154dfa92ca6ee761c358e58a3e35831558bb5 /drivers/ntb/hw | |
| parent | tty: cpm_uart: drop unused iflag macro (diff) | |
| parent | Linux 5.2-rc3 (diff) | |
| download | linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.zip | |
Merge 5.2-rc3 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ntb/hw')
| -rw-r--r-- | drivers/ntb/hw/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ntb/hw/Makefile | 1 | ||||
| -rw-r--r-- | drivers/ntb/hw/amd/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ntb/hw/amd/Makefile | 1 | ||||
| -rw-r--r-- | drivers/ntb/hw/idt/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ntb/hw/idt/Makefile | 1 | ||||
| -rw-r--r-- | drivers/ntb/hw/intel/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ntb/hw/intel/Makefile | 1 | ||||
| -rw-r--r-- | drivers/ntb/hw/mscc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ntb/hw/mscc/Makefile | 1 |
10 files changed, 10 insertions, 0 deletions
diff --git a/drivers/ntb/hw/Kconfig b/drivers/ntb/hw/Kconfig index e51b581fd102..e77c587060ff 100644 --- a/drivers/ntb/hw/Kconfig +++ b/drivers/ntb/hw/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only source "drivers/ntb/hw/amd/Kconfig" source "drivers/ntb/hw/idt/Kconfig" source "drivers/ntb/hw/intel/Kconfig" diff --git a/drivers/ntb/hw/Makefile b/drivers/ntb/hw/Makefile index 923c442db750..4714d6238845 100644 --- a/drivers/ntb/hw/Makefile +++ b/drivers/ntb/hw/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_NTB_AMD) += amd/ obj-$(CONFIG_NTB_IDT) += idt/ obj-$(CONFIG_NTB_INTEL) += intel/ diff --git a/drivers/ntb/hw/amd/Kconfig b/drivers/ntb/hw/amd/Kconfig index cfe903cd9514..dd9fb9e5c812 100644 --- a/drivers/ntb/hw/amd/Kconfig +++ b/drivers/ntb/hw/amd/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config NTB_AMD tristate "AMD Non-Transparent Bridge support" depends on X86_64 diff --git a/drivers/ntb/hw/amd/Makefile b/drivers/ntb/hw/amd/Makefile index ad54da917563..7c23b4a7f3c2 100644 --- a/drivers/ntb/hw/amd/Makefile +++ b/drivers/ntb/hw/amd/Makefile @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_NTB_AMD) += ntb_hw_amd.o diff --git a/drivers/ntb/hw/idt/Kconfig b/drivers/ntb/hw/idt/Kconfig index f8948cf515ce..bfc7cac94102 100644 --- a/drivers/ntb/hw/idt/Kconfig +++ b/drivers/ntb/hw/idt/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config NTB_IDT tristate "IDT PCIe-switch Non-Transparent Bridge support" depends on PCI diff --git a/drivers/ntb/hw/idt/Makefile b/drivers/ntb/hw/idt/Makefile index a102cf154be0..f75e9d65c8a2 100644 --- a/drivers/ntb/hw/idt/Makefile +++ b/drivers/ntb/hw/idt/Makefile @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_NTB_IDT) += ntb_hw_idt.o diff --git a/drivers/ntb/hw/intel/Kconfig b/drivers/ntb/hw/intel/Kconfig index 91f995e33ac6..ed4d6dd57018 100644 --- a/drivers/ntb/hw/intel/Kconfig +++ b/drivers/ntb/hw/intel/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config NTB_INTEL tristate "Intel Non-Transparent Bridge support" depends on X86_64 diff --git a/drivers/ntb/hw/intel/Makefile b/drivers/ntb/hw/intel/Makefile index 4ff22af967c6..60ec8a773eea 100644 --- a/drivers/ntb/hw/intel/Makefile +++ b/drivers/ntb/hw/intel/Makefile @@ -1,2 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_NTB_INTEL) += ntb_hw_intel.o ntb_hw_intel-y := ntb_hw_gen1.o ntb_hw_gen3.o diff --git a/drivers/ntb/hw/mscc/Kconfig b/drivers/ntb/hw/mscc/Kconfig index 013ed6716438..ea63bd829da2 100644 --- a/drivers/ntb/hw/mscc/Kconfig +++ b/drivers/ntb/hw/mscc/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config NTB_SWITCHTEC tristate "MicroSemi Switchtec Non-Transparent Bridge Support" select PCI_SW_SWITCHTEC diff --git a/drivers/ntb/hw/mscc/Makefile b/drivers/ntb/hw/mscc/Makefile index 064686ead1ba..756a75abee52 100644 --- a/drivers/ntb/hw/mscc/Makefile +++ b/drivers/ntb/hw/mscc/Makefile @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_NTB_SWITCHTEC) += ntb_hw_switchtec.o |