diff options
author | Tony Lindgren <tony@atomide.com> | 2012-09-05 17:06:08 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-05 17:06:08 (GMT) |
commit | 580a7ce8fb5012c0c0afe592bdafd482a3679911 (patch) | |
tree | 3fb6b00359a63d8d2e33005599046c105956d314 /arch/arm/mach-omap2/Kconfig | |
parent | a17fb8f520c3c662686aa54a86773f354002c7d3 (diff) | |
parent | e534e871a94ba2e3bfdf0edd3685eb805fc960d8 (diff) | |
download | linux-580a7ce8fb5012c0c0afe592bdafd482a3679911.tar.xz |
Merge branch 'fixes-wakeupgen' into fixes
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 0a3e1b9..346fd26 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -62,13 +62,14 @@ config ARCH_OMAP4 select PM_OPP if PM select USB_ARCH_HAS_EHCI if USB_SUPPORT select ARM_CPU_SUSPEND if PM - select ARCH_NEEDS_CPU_IDLE_COUPLED + select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP config SOC_OMAP5 bool "TI OMAP5" select CPU_V7 select ARM_GIC select HAVE_SMP + select ARM_CPU_SUSPEND if PM comment "OMAP Core Type" depends on ARCH_OMAP2 |