Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', ...

[sfrench/cifs-2.6.git] / drivers / cpuidle / Kconfig

diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index 3bed4127d4ad364431427b01e323dce256bc4278..7dbc4a83c45c481cdf743fb531c95a4b67a8bb5a 100644 (file)
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -1,13 +1,13 @@
 
 config CPU_IDLE
        bool "CPU idle PM support"
+       default ACPI
        help
          CPU idle is a generic framework for supporting software-controlled
          idle processor power management.  It includes modular cross-platform
          governors that can be swapped during runtime.
 
-         If you're using a mobile platform that supports CPU idle PM (e.g.
-         an ACPI-capable notebook), you should say Y here.
+         If you're using an ACPI-enabled platform, you should say Y here.
 
 config CPU_IDLE_GOV_LADDER
        bool