Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3a75a0b2bebb2f2532e6458ee3c6a029168c4f7e..8bab719b2eb01ed4d49cce6cf00057526f229106 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -406,8 +406,9 @@ config ARCH_OMAP
        bool "TI OMAP"
        select GENERIC_GPIO
        select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS
        help
-         Support for TI's OMAP platform (OMAP1 and OMAP2).
+         Support for TI's OMAP platform (OMAP1, OMAP2 and OMAP3).
 
 endchoice
 
@@ -951,7 +952,7 @@ config FPE_FASTFPE
 
 config VFP
        bool "VFP-format floating point maths"
-       depends on CPU_V6 || CPU_ARM926T
+       depends on CPU_V6 || CPU_ARM926T || CPU_V7
        help
          Say Y to include VFP support code in the kernel. This is needed
          if your hardware includes a VFP unit.
@@ -961,6 +962,18 @@ config VFP
 
          Say N if your target does not have VFP hardware.
 
+config VFPv3
+       bool
+       depends on VFP
+       default y if CPU_V7
+
+config NEON
+       bool "NEON Advanced SIMD Extension support"
+       depends on VFPv3 && CPU_V7
+       help
+         Say Y to include support code for NEON, the ARMv7 Advanced SIMD
+         Extensions.
+
 endmenu
 
 menu "Userspace binary formats"
@@ -1072,6 +1085,11 @@ source "drivers/rtc/Kconfig"
 
 source "drivers/dma/Kconfig"
 
+if ARCH_OMAP
+source "drivers/cbus/Kconfig"
+source "drivers/dsp/dspgateway/Kconfig"
+endif
+
 endmenu
 
 source "fs/Kconfig"