Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 503414718905..4f01533083cc 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -25,6 +25,7 @@ config ARCH_OMAP2
         depends on ARCH_OMAP2PLUS
         default y
         select CPU_V6
+        select MULTI_IRQ_HANDLER
 
 config ARCH_OMAP3
         bool "TI OMAP3"
@@ -36,13 +37,16 @@ config ARCH_OMAP3
         select ARCH_HAS_OPP
         select PM_OPP if PM
         select ARM_CPU_SUSPEND if PM
+        select MULTI_IRQ_HANDLER
 
 config ARCH_OMAP4
         bool "TI OMAP4"
         default y
         depends on ARCH_OMAP2PLUS
+        select CACHE_L2X0
         select CPU_V7
         select ARM_GIC
+        select HAVE_SMP
         select LOCAL_TIMERS if SMP
         select PL310_ERRATA_588369
         select PL310_ERRATA_727915
@@ -334,6 +338,7 @@ config MACH_OMAP4_PANDA
 config OMAP3_EMU
         bool "OMAP3 debugging peripherals"
         depends on ARCH_OMAP3
+        select ARM_AMBA
         select OC_ETM
         help
           Say Y here to enable debugging hardware of omap3