1 files changed, 18 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 709f9d383c87..e53b0ed9d00a 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.
 
@@ -366,6 +367,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.
 
@@ -409,6 +411,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"
@@ -477,6 +490,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
@@ -657,6 +672,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