Merge branch 'for-linus' into for-next

[linux.git] / drivers / cpufreq / Kconfig.x86

diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
index dfa6457deaf6081456fa29ca9b833b5d2eb64c28..a6528388952eca47c2baf81253d2cacc2296122b 100644 (file)
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@ -4,17 +4,17 @@
 #
 
 config X86_INTEL_PSTATE
-       bool "Intel P state control"
-       depends on X86
-       select ACPI_PROCESSOR if ACPI
-       select ACPI_CPPC_LIB if X86_64 && ACPI && SCHED_MC_PRIO
-       help
-          This driver provides a P state for Intel core processors.
+       bool "Intel P state control"
+       depends on X86
+       select ACPI_PROCESSOR if ACPI
+       select ACPI_CPPC_LIB if X86_64 && ACPI && SCHED_MC_PRIO
+       help
+         This driver provides a P state for Intel core processors.
          The driver implements an internal governor and will become
-          the scaling driver and governor for Sandy bridge processors.
+         the scaling driver and governor for Sandy bridge processors.
 
          When this driver is enabled it will become the preferred
-          scaling driver for Sandy bridge processors.
+         scaling driver for Sandy bridge processors.
 
          If in doubt, say N.