Merge branch 'v3.10/topic/dm-crypt' into linux-linaro-lsk-v3.10

[firefly-linux-kernel-4.4.55.git] / drivers / cpuidle / Kconfig.arm64

diff --git a/drivers/cpuidle/Kconfig.arm64 b/drivers/cpuidle/Kconfig.arm64
index b83612c67e6de58cc5e10937c1a0445818ed839b..d0a08ed1b2ee62823e3f457a1ebf4905a41332f4 100644 (file)
--- a/drivers/cpuidle/Kconfig.arm64
+++ b/drivers/cpuidle/Kconfig.arm64
@@ -4,10 +4,11 @@
 
 config ARM64_CPUIDLE
        bool "Generic ARM64 CPU idle Driver"
-       select OF_IDLE_STATES
+       select ARM64_CPU_SUSPEND
+       select DT_IDLE_STATES
        help
-         Select this to enable generic cpuidle driver for ARM v8.
+         Select this to enable generic cpuidle driver for ARM64.
          It provides a generic idle driver whose idle states are configured
          at run-time through DT nodes. The CPUidle suspend backend is
-         initialized by the device tree parsing code on matching the entry
-         method to the respective CPU operations.
+         initialized by calling the CPU operations init idle hook
+         provided by architecture code.