diff options
| author | Maxime Ripard <[email protected]> | 2019-04-08 10:27:17 +0200 |
|---|---|---|
| committer | Maxime Ripard <[email protected]> | 2019-04-08 10:27:17 +0200 |
| commit | b85d00bfef2a62180d9ae74ecc95befe37686836 (patch) | |
| tree | 8d4347eac61358e8c7f6e1f40ad5677e5321eb97 /include/linux/platform_data | |
| parent | cd9063757a227cf31ebf5391ccda2bf583b0806e (diff) | |
| parent | 9b39b013037fbfa8d4b999345d9e904d8a336fc2 (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
We haven't backmerged for a while and this creates some coherency issues
across DRM drivers.
Signed-off-by: Maxime Ripard <[email protected]>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/gpio/gpio-amd-fch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/gpio/gpio-amd-fch.h b/include/linux/platform_data/gpio/gpio-amd-fch.h index a867637e172d..9e46678edb2a 100644 --- a/include/linux/platform_data/gpio/gpio-amd-fch.h +++ b/include/linux/platform_data/gpio/gpio-amd-fch.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL+ */ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * AMD FCH gpio driver platform-data |