summaryrefslogtreecommitdiffstats
path: root/include/linux/platform_data/st_sensors_pdata.h
diff options
context:
space:
mode:
authorMaarten Lankhorst2019-06-19 12:32:13 +0200
committerMaarten Lankhorst2019-06-19 12:32:13 +0200
commitbcb7416e3480c1abb46266bdab874b3b3d6124cb (patch)
tree9d889b14957c0e266697d0674675bc42b0899571 /include/linux/platform_data/st_sensors_pdata.h
parentdrm/vc4: hdmi: Set default state margin at reset (diff)
parentMerge v5.2-rc5 into drm-next (diff)
downloadkernel-qcow2-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.tar.gz
kernel-qcow2-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.tar.xz
kernel-qcow2-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.zip
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh backmerge of drm-next to pull it in. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'include/linux/platform_data/st_sensors_pdata.h')
-rw-r--r--include/linux/platform_data/st_sensors_pdata.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/platform_data/st_sensors_pdata.h b/include/linux/platform_data/st_sensors_pdata.h
index 728193111c2f..30929c22227d 100644
--- a/include/linux/platform_data/st_sensors_pdata.h
+++ b/include/linux/platform_data/st_sensors_pdata.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* STMicroelectronics sensors platform-data driver
*
* Copyright 2013 STMicroelectronics Inc.
*
* Denis Ciocca <denis.ciocca@st.com>
- *
- * Licensed under the GPL-2.
*/
#ifndef ST_SENSORS_PDATA_H