diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-27 14:19:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-27 14:19:53 +0200 |
| commit | 9aadfa8fd9f8d311ba3014bf76e4d8aeee515533 (patch) | |
| tree | a34c6fb208a5994438efa935466e4e0b1e730551 /drivers/cpuidle/Kconfig | |
| parent | 9ec7684c976bc528c2f37bbc0045fab28d16d172 (diff) | |
| parent | be100ee83a812804d1f467f45aba9809ba49b732 (diff) | |
| download | linux-next-9aadfa8fd9f8d311ba3014bf76e4d8aeee515533.tar.gz | |
Merge branch 'cpuidle-arm' into pm-cpuidle
* cpuidle-arm:
ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle
ARM: ux500: cpuidle: Remove pointless include
ARM: ux500: cpuidle: Instantiate the driver from platform device
ARM: davinci: cpuidle: Fix target residency
cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq
Diffstat (limited to 'drivers/cpuidle/Kconfig')
| -rw-r--r-- | drivers/cpuidle/Kconfig | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig index 0e2cd5cab4d0..b3fb81d7cf04 100644 --- a/drivers/cpuidle/Kconfig +++ b/drivers/cpuidle/Kconfig @@ -1,5 +1,6 @@ +menu "CPU Idle" -menuconfig CPU_IDLE +config CPU_IDLE bool "CPU idle PM support" default y if ACPI || PPC_PSERIES select CPU_IDLE_GOV_LADDER if (!NO_HZ && !NO_HZ_IDLE) @@ -29,20 +30,13 @@ config CPU_IDLE_GOV_MENU bool "Menu governor (for tickless system)" default y -config CPU_IDLE_CALXEDA - bool "CPU Idle Driver for Calxeda processors" - depends on ARCH_HIGHBANK - select ARM_CPU_SUSPEND - help - Select this to enable cpuidle on Calxeda processors. - -config CPU_IDLE_ZYNQ - bool "CPU Idle Driver for Xilinx Zynq processors" - depends on ARCH_ZYNQ - help - Select this to enable cpuidle on Xilinx Zynq processors. +menu "ARM CPU Idle Drivers" +depends on ARM +source "drivers/cpuidle/Kconfig.arm" +endmenu endif config ARCH_NEEDS_CPU_IDLE_COUPLED def_bool n +endmenu |