1 files changed, 31 insertions, 3 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a32b3b52c5c0..6835a4c8affa 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -180,8 +180,8 @@ config ARCH_AT91
         bool "Atmel AT91"
         select GENERIC_GPIO
         help
-          This enables support for systems based on the Atmel AT91RM9200
-          and AT91SAM9xxx processors.
+          This enables support for systems based on the Atmel AT91RM9200,
+          AT91SAM9 and AT91CAP9 processors.
 
 config ARCH_CLPS7500
         bool "Cirrus CL-PS7500FE"
@@ -217,6 +217,7 @@ config ARCH_EP93XX
         bool "EP93xx-based"
         select ARM_AMBA
         select ARM_VIC
+        select GENERIC_GPIO
         help
           This enables support for the Cirrus EP93xx series of CPUs.
 
@@ -376,6 +377,7 @@ config ARCH_SA1100
         select ARCH_DISCONTIGMEM_ENABLE
         select ARCH_MTD_XIP
         select GENERIC_GPIO
+        select GENERIC_TIME
         help
           Support for StrongARM 11x0 based boards.
 
@@ -419,6 +421,17 @@ config ARCH_OMAP
         help
           Support for TI's OMAP platform (OMAP1 and OMAP2).
 
+config ARCH_MSM7X00A
+        bool "Qualcomm MSM7X00A"
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        help
+          Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
+          apps processor of the MSM7X00A and depends on a shared memory
+          interface to the ARM9 modem processor which runs the baseband stack
+          and controls some vital subsystems (clock and power control, etc).
+          <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
+
 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
@@ -489,6 +502,8 @@ source "arch/arm/mach-davinci/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"
 
+source "arch/arm/mach-msm/Kconfig"
+
 # Definitions to make life easier
 config ARCH_ACORN
         bool
@@ -669,6 +684,7 @@ config HZ
         default 128 if ARCH_L7200
         default 200 if ARCH_EBSA110 || ARCH_S3C2410
         default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
+        default AT91_TIMER_HZ if ARCH_AT91
         default 100
 
 config AEABI
@@ -963,7 +979,7 @@ config FPE_FASTFPE
 
 config VFP
         bool "VFP-format floating point maths"
-        depends on CPU_V6 || CPU_ARM926T || CPU_FEROCEON
+        depends on CPU_V6 || CPU_ARM926T || CPU_V7 || CPU_FEROCEON
         help
           Say Y to include VFP support code in the kernel. This is needed
           if your hardware includes a VFP unit.
@@ -973,6 +989,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 "Advanced SIMD (NEON) Extension support"
+        depends on VFPv3 && CPU_V7
+        help
+          Say Y to include support code for NEON, the ARMv7 Advanced SIMD
+          Extension.
+
 endmenu
 
 menu "Userspace binary formats"