Pull thermal into release branch

[linux-drm-fsl-dcu.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 578880943cf24752c78db06fa6922be2f472069b..7393109f5c3027f4a9973294954d5bfb53d65f34 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -8,6 +8,8 @@ config ARCH_OMAP24XX
 config ARCH_OMAP2420
        bool "OMAP2420 support"
        depends on ARCH_OMAP24XX
+       select OMAP_DM_TIMER
+       select ARCH_OMAP_OTG
 
 comment "OMAP Board Type"
        depends on ARCH_OMAP2
@@ -19,4 +21,8 @@ config MACH_OMAP_GENERIC
 config MACH_OMAP_H4
        bool "OMAP 2420 H4 board"
        depends on ARCH_OMAP2 && ARCH_OMAP24XX
+       select OMAP_DEBUG_LEDS if LEDS || LEDS_OMAP_DEBUG
 
+config MACH_OMAP_APOLLON
+       bool "OMAP 2420 Apollon board"
+       depends on ARCH_OMAP2 && ARCH_OMAP24XX