Merge branch 'omap-all' into devel

Conflicts:

	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/irq.c

1 files changed, 21 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 7069c9d536f1..4832fcc7d04a 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -15,8 +15,17 @@ config ARCH_OMAP2430
         bool "OMAP2430 support"
         depends on ARCH_OMAP24XX
 
+config ARCH_OMAP34XX
+        bool "OMAP34xx Based System"
+        depends on ARCH_OMAP3
+
+config ARCH_OMAP3430
+        bool "OMAP3430 support"
+        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        select ARCH_OMAP_OTG
+
 comment "OMAP Board Type"
-        depends on ARCH_OMAP2
+        depends on ARCH_OMAP2 || ARCH_OMAP3
 
 config MACH_OMAP_GENERIC
         bool "Generic OMAP board"
@@ -35,3 +44,14 @@ config MACH_OMAP_2430SDP
         bool "OMAP 2430 SDP board"
         depends on ARCH_OMAP2 && ARCH_OMAP24XX
 
+config MACH_OMAP3_BEAGLE
+        bool "OMAP3 BEAGLE board"
+        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config MACH_OMAP_LDP
+        bool "OMAP3 LDP board"
+        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config MACH_OVERO
+        bool "Gumstix Overo board"
+        depends on ARCH_OMAP3 && ARCH_OMAP34XX