summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDirk Brandewie <dirk.brandewie@gmail.com>2013-02-15 01:55:34 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-16 01:54:59 +0400
commitda0d9fda3743769484d3db5a17a121599076e869 (patch)
treed04920e7892d6588df21e40ffbfa1cea3fc2c3ea /drivers
parent191e5edf96dc4939f5db0605cc65de9f4d88d155 (diff)
downloadlinux-da0d9fda3743769484d3db5a17a121599076e869.tar.xz
cpufreq / intel_pstate: Change to disallow module build
Load order is important in order for intel_pstate to take over as the default scaling driver from acpi-cpufreq. If both are built-in, acpi-cpufreq uses late_initcall() and intel_pstate uses device_initcall() so it will be able to register as the scaling before acpi-cpufreq for the processors supported by intel_pstate. If acpi-cpufreq is built as a module then intel_pstate still gets first option to become the scaling driver. Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/Kconfig.x867
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
index 6aa7053ce2ef..98e5abbe8f26 100644
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@ -3,7 +3,7 @@
#
config X86_INTEL_PSTATE
- tristate "Intel P state control"
+ bool "Intel P state control"
depends on X86
help
This driver provides a P state for Intel core processors.
@@ -13,11 +13,6 @@ config X86_INTEL_PSTATE
When this driver is enabled it will become the perferred
scaling driver for Sandy bridge processors.
- Note: This driver should be built with the same settings as
- the other scaling drivers configured into the system
- (module/built-in) in order for the driver to register itself
- as the scaling driver on the system.
-
If in doubt, say N.
config X86_PCC_CPUFREQ