diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-26 10:36:36 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-26 10:36:36 +0200 |
commit | c825dda905bac330c2da7fabdf5c0ac28758b3cd (patch) | |
tree | 597fe4f90c49f784a0dbf1596c027880747210ec /arch/arm/Kconfig | |
parent | Merge branch 'pm' into devel-stable (diff) | |
parent | ARM: mm: Add strongly ordered descriptor support. (diff) | |
download | linux-c825dda905bac330c2da7fabdf5c0ac28758b3cd.tar.xz linux-c825dda905bac330c2da7fabdf5c0ac28758b3cd.zip |
Merge branch 'for_3_2/for-rmk/arm_cpu_pm' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5a3a78633177..9c4caa633d04 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -29,6 +29,7 @@ config ARM select HAVE_GENERIC_HARDIRQS select HAVE_SPARSE_IRQ select GENERIC_IRQ_SHOW + select CPU_PM if (SUSPEND || CPU_IDLE) help The ARM series is a line of low-power-consumption RISC chip designs licensed by ARM Ltd and targeted at embedded applications and |