Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

[pandora-kernel.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 92b004b..1a2cf62 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -35,6 +35,8 @@ config ARCH_OMAP3
        select CPU_V7
        select USB_ARCH_HAS_EHCI
        select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4
+       select ARCH_HAS_OPP
+       select PM_OPP if PM
 
 config ARCH_OMAP4
        bool "TI OMAP4"
@@ -44,6 +46,9 @@ config ARCH_OMAP4
        select ARM_GIC
        select PL310_ERRATA_588369
        select ARM_ERRATA_720789
+       select ARCH_HAS_OPP
+       select PM_OPP if PM
+       select USB_ARCH_HAS_EHCI
 
 comment "OMAP Core Type"
        depends on ARCH_OMAP2