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/ipack | |
| parent | tty: cpm_uart: drop unused iflag macro (diff) | |
| parent | Linux 5.2-rc3 (diff) | |
| download | linux-dev-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz linux-dev-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/ipack')
| -rw-r--r-- | drivers/ipack/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ipack/Makefile | 1 | ||||
| -rw-r--r-- | drivers/ipack/carriers/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ipack/carriers/Makefile | 1 | ||||
| -rw-r--r-- | drivers/ipack/devices/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ipack/devices/Makefile | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ipack/Kconfig b/drivers/ipack/Kconfig index 3949e5589560..68a422f7b271 100644 --- a/drivers/ipack/Kconfig +++ b/drivers/ipack/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # IPACK configuration. # diff --git a/drivers/ipack/Makefile b/drivers/ipack/Makefile index 6f14ade0f8f3..284f0455424c 100644 --- a/drivers/ipack/Makefile +++ b/drivers/ipack/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Makefile for the IPACK bridge device drivers. # diff --git a/drivers/ipack/carriers/Kconfig b/drivers/ipack/carriers/Kconfig index 922ff5c35acc..01c2dc947345 100644 --- a/drivers/ipack/carriers/Kconfig +++ b/drivers/ipack/carriers/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config BOARD_TPCI200 tristate "Support for the TEWS TPCI-200 IndustryPack carrier board" depends on IPACK_BUS diff --git a/drivers/ipack/carriers/Makefile b/drivers/ipack/carriers/Makefile index d8b76459300f..0301cae31e6a 100644 --- a/drivers/ipack/carriers/Makefile +++ b/drivers/ipack/carriers/Makefile @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_BOARD_TPCI200) += tpci200.o diff --git a/drivers/ipack/devices/Kconfig b/drivers/ipack/devices/Kconfig index 907a8cb48f2a..75a62d170a82 100644 --- a/drivers/ipack/devices/Kconfig +++ b/drivers/ipack/devices/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config SERIAL_IPOCTAL tristate "IndustryPack IP-OCTAL uart support" depends on IPACK_BUS && TTY diff --git a/drivers/ipack/devices/Makefile b/drivers/ipack/devices/Makefile index 6de18bda4a9a..67a7ed684d95 100644 --- a/drivers/ipack/devices/Makefile +++ b/drivers/ipack/devices/Makefile @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_SERIAL_IPOCTAL) += ipoctal.o |