summaryrefslogtreecommitdiffstats
path: root/include/dt-bindings/mfd/qcom-rpm.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-08 03:11:56 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-08 03:11:56 +0100
commit0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch)
treef0aa64e956d1d2addb2263ddcd238e9f014b36a0 /include/dt-bindings/mfd/qcom-rpm.h
parentInput: convert autorepeat timer to use timer_setup() (diff)
parentLinux 4.14-rc8 (diff)
downloadlinux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.xz
linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.zip
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge problems when some header files get deleted.
Diffstat (limited to 'include/dt-bindings/mfd/qcom-rpm.h')
-rw-r--r--include/dt-bindings/mfd/qcom-rpm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/dt-bindings/mfd/qcom-rpm.h b/include/dt-bindings/mfd/qcom-rpm.h
index 54aef5e21763..c9204c4df520 100644
--- a/include/dt-bindings/mfd/qcom-rpm.h
+++ b/include/dt-bindings/mfd/qcom-rpm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* This header provides constants for the Qualcomm RPM bindings.
*/