summaryrefslogtreecommitdiff
path: root/include/uapi/linux/wmi.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-12 08:37:39 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-12 08:37:39 +0300
commite6aa640eb2f68920cb849aec0cab44f05d843238 (patch)
tree42e07ee412112abe90d459f821e8d73c26cc648e /include/uapi/linux/wmi.h
parent1f573cce48a2ebb35953034062ef01056b7d6a58 (diff)
parentd45331b00ddb179e291766617259261c112db872 (diff)
downloadlinux-e6aa640eb2f68920cb849aec0cab44f05d843238.tar.xz
Merge 5.3-rc4 into driver-core-next
We need the driver core fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux/wmi.h')
-rw-r--r--include/uapi/linux/wmi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/wmi.h b/include/uapi/linux/wmi.h
index c36f2d7675a4..7085c5dca9fa 100644
--- a/include/uapi/linux/wmi.h
+++ b/include/uapi/linux/wmi.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
/*
* User API methods for ACPI-WMI mapping driver
*