Merge branch 'master' into next

[~andy/linux] / arch / arm / plat-omap / Kconfig

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index f4e05134aafac42125a844a9dffd481470f1a17b..18fe3cb195dce938ee47b3f37ac2ecd8c2f64298 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -11,13 +11,14 @@ choice
 
 config ARCH_OMAP1
        bool "TI OMAP1"
-       select COMMON_CLKDEV
+       select CLKDEV_LOOKUP
        help
          "Systems based on omap7xx, omap15xx or omap16xx"
 
 config ARCH_OMAP2PLUS
        bool "TI OMAP2/3/4"
-       select COMMON_CLKDEV
+       select CLKDEV_LOOKUP
+       select OMAP_DM_TIMER
        help
          "Systems based on OMAP2, OMAP3 or OMAP4"
 
@@ -37,7 +38,7 @@ config OMAP_DEBUG_LEDS
 
 config OMAP_SMARTREFLEX
        bool "SmartReflex support"
-       depends on ARCH_OMAP3 && PM
+       depends on (ARCH_OMAP3 || ARCH_OMAP4) && PM
        help
          Say Y if you want to enable SmartReflex.