diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-16 16:10:30 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-16 16:10:30 +0200 |
| commit | 79d6c4093bb14e5a48b727c1e98f4fc8c8529e8d (patch) | |
| tree | c831f6e144b546ac977dc5e1760461b935caf156 /tools/power | |
| parent | 0b8417c14181595997091145342954332fa016cd (diff) | |
| parent | 527b7779e5ecabb057089b760140309bdcacc16a (diff) | |
| download | linux-stable-79d6c4093bb14e5a48b727c1e98f4fc8c8529e8d.tar.gz linux-stable-79d6c4093bb14e5a48b727c1e98f4fc8c8529e8d.tar.bz2 linux-stable-79d6c4093bb14e5a48b727c1e98f4fc8c8529e8d.zip | |
Merge tag 'linux-cpupower-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux
Pull cpupower utility updates for 5.10-rc1 from Shuah Khan:
"This update consists of minor fixes for spelling and speeding up
generating git version string which will in turn speed up compiles."
* tag 'linux-cpupower-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
cpupower: speed up generating git version string
cpupowerutils: fix spelling mistake "dependant" -> "dependent"
Diffstat (limited to 'tools/power')
| -rw-r--r-- | tools/power/cpupower/Makefile | 2 | ||||
| -rw-r--r-- | tools/power/cpupower/debug/i386/intel_gsic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index c8622497ef23..c7bcddbd486d 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile @@ -51,7 +51,7 @@ DESTDIR ?= # Package-related definitions. Distributions can modify the version # and _should_ modify the PACKAGE_BUGREPORT definition -VERSION= $(shell ./utils/version-gen.sh) +VERSION:= $(shell ./utils/version-gen.sh) LIB_MAJ= 0.0.1 LIB_MIN= 0 diff --git a/tools/power/cpupower/debug/i386/intel_gsic.c b/tools/power/cpupower/debug/i386/intel_gsic.c index e5e926f46d6b..befd837f07f8 100644 --- a/tools/power/cpupower/debug/i386/intel_gsic.c +++ b/tools/power/cpupower/debug/i386/intel_gsic.c @@ -71,7 +71,7 @@ int main (void) printf("\tsmi_cmd=0x?? smi_port=0x?? smi_sig=1\n"); printf("\nUnfortunately, you have to know what exactly are " "smi_cmd and smi_port, and this\nis system " - "dependant.\n"); + "dependent.\n"); } return 1; } |