summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/speedstep-lib.c
diff options
context:
space:
mode:
authorAlex Deucher2019-06-25 15:42:25 +0200
committerAlex Deucher2019-06-25 15:42:25 +0200
commitd7929c1e13e3788e7cb741d75b5baec5e53eff21 (patch)
treecf513071edfc4499b4e025e4846244c9d0e4c6bd /drivers/cpufreq/speedstep-lib.c
parentdrm/amdgpu: disable gfxoff on navi10 (diff)
parentdrm/edid: use for_each_displayid_db where applicable (diff)
downloadkernel-qcow2-linux-d7929c1e13e3788e7cb741d75b5baec5e53eff21.tar.gz
kernel-qcow2-linux-d7929c1e13e3788e7cb741d75b5baec5e53eff21.tar.xz
kernel-qcow2-linux-d7929c1e13e3788e7cb741d75b5baec5e53eff21.zip
Merge branch 'drm-next' into drm-next-5.3
Backmerge drm-next and fix up conflicts due to drmP.h removal. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/cpufreq/speedstep-lib.c')
-rw-r--r--drivers/cpufreq/speedstep-lib.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/cpufreq/speedstep-lib.c b/drivers/cpufreq/speedstep-lib.c
index cabb6f48eb77..5c4f8f07c5a6 100644
--- a/drivers/cpufreq/speedstep-lib.c
+++ b/drivers/cpufreq/speedstep-lib.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
*
- * Licensed under the terms of the GNU GPL License version 2.
- *
* Library for common functions for Intel SpeedStep v.1 and v.2 support
*
* BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*