Merge branch 'drivers/ocp2scp' into next/drivers

[~andy/linux] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index dd2db025f7787e590d94bb229cb143559f9a8317..728b05eb2964933ee52a9a09c23d679b8c98a42a 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -44,6 +44,7 @@ config ARCH_OMAP3
        select ARM_CPU_SUSPEND if PM
        select MULTI_IRQ_HANDLER
        select SOC_HAS_OMAP2_SDRC
+       select OMAP_INTERCONNECT
 
 config ARCH_OMAP4
        bool "TI OMAP4"
@@ -62,13 +63,15 @@ 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
+       select OMAP_INTERCONNECT
 
 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