diff options
| author | Greg Kroah-Hartman | 2019-06-09 09:11:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-09 09:11:21 +0200 |
| commit | 0154ec71d597692a0d0682b19eac4b3adfb7f3dc (patch) | |
| tree | 121b4ac35146f5696da090d3ae2534c76523e6c2 /drivers/misc/c2port | |
| parent | VMCI: Fixup atomic64_t abuse (diff) | |
| parent | Linux 5.2-rc4 (diff) | |
| download | kernel-qcow2-linux-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.tar.gz kernel-qcow2-linux-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.tar.xz kernel-qcow2-linux-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.zip | |
Merge 5.2-rc4 into char-misc-next
We want the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/c2port')
| -rw-r--r-- | drivers/misc/c2port/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/misc/c2port/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/c2port/Kconfig b/drivers/misc/c2port/Kconfig index 9c4753789850..e20516ffd91e 100644 --- a/drivers/misc/c2port/Kconfig +++ b/drivers/misc/c2port/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # C2 port devices # diff --git a/drivers/misc/c2port/Makefile b/drivers/misc/c2port/Makefile index 3b2cf43d60f5..1dfe6ab0672a 100644 --- a/drivers/misc/c2port/Makefile +++ b/drivers/misc/c2port/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_C2PORT) += core.o obj-$(CONFIG_C2PORT_DURAMAR_2150) += c2port-duramar2150.o |