diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
| commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
| tree | 455e80aca7b57b17069fab252261c4dcae44374d /drivers/powercap | |
| parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
| parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- fix build rules in binderfs sample
- fix build errors when Kbuild recurses to the top Makefile
- covert '---help---' in Kconfig to 'help'
* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
treewide: replace '---help---' in Kconfig files with 'help'
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'drivers/powercap')
| -rw-r--r-- | drivers/powercap/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/powercap/Kconfig b/drivers/powercap/Kconfig index dc1c1381d7fa..ebc4d4578339 100644 --- a/drivers/powercap/Kconfig +++ b/drivers/powercap/Kconfig @@ -23,7 +23,7 @@ config INTEL_RAPL tristate "Intel RAPL Support via MSR Interface" depends on X86 && IOSF_MBI select INTEL_RAPL_CORE - ---help--- + help This enables support for the Intel Running Average Power Limit (RAPL) technology via MSR interface, which allows power limits to be enforced and monitored on modern Intel processors (Sandy Bridge and later). |