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 925ccb3..1a2cf62 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -15,7 +15,7 @@ config ARCH_OMAP2PLUS_TYPICAL
        select SERIAL_OMAP_CONSOLE
        select I2C
        select I2C_OMAP
-       select MFD
+       select MFD_SUPPORT
        select MENELAUS if ARCH_OMAP2
        select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
        select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
@@ -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
@@ -189,6 +194,7 @@ config MACH_OMAP3_PANDORA
        depends on ARCH_OMAP3
        default y
        select OMAP_PACKAGE_CBB
+       select REGULATOR_FIXED_VOLTAGE
 
 config MACH_OMAP3_TOUCHBOOK
        bool "OMAP3 Touch Book"
@@ -240,6 +246,7 @@ config MACH_OMAP_ZOOM2
        select SERIAL_8250
        select SERIAL_CORE_CONSOLE
        select SERIAL_8250_CONSOLE
+       select REGULATOR_FIXED_VOLTAGE
 
 config MACH_OMAP_ZOOM3
        bool "OMAP3630 Zoom3 board"
@@ -249,6 +256,7 @@ config MACH_OMAP_ZOOM3
        select SERIAL_8250
        select SERIAL_CORE_CONSOLE
        select SERIAL_8250_CONSOLE
+       select REGULATOR_FIXED_VOLTAGE
 
 config MACH_CM_T35
        bool "CompuLab CM-T35 module"