Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux.git] / drivers / powercap / Kconfig

diff --git a/drivers/powercap/Kconfig b/drivers/powercap/Kconfig
index 42d3798c88f0d2ae8cd24abc9045eaec0beffe96..dc1c1381d7fa95cddbf1070cb0922032c32db35d 100644 (file)
--- a/drivers/powercap/Kconfig
+++ b/drivers/powercap/Kconfig
@@ -16,14 +16,17 @@ menuconfig POWERCAP
 
 if POWERCAP
 # Client driver configurations go here.
+config INTEL_RAPL_CORE
+       tristate
+
 config INTEL_RAPL
-       tristate "Intel RAPL Support"
+       tristate "Intel RAPL Support via MSR Interface"
        depends on X86 && IOSF_MBI
-       default n
+       select INTEL_RAPL_CORE
        ---help---
          This enables support for the Intel Running Average Power Limit (RAPL)
-         technology which allows power limits to be enforced and monitored on
-         modern Intel processors (Sandy Bridge and later).
+         technology via MSR interface, which allows power limits to be enforced
+         and monitored on modern Intel processors (Sandy Bridge and later).
 
          In RAPL, the platform level settings are divided into domains for
          fine grained control. These domains include processor package, DRAM