1 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index aad0add99a5e..5d60508472f0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -217,6 +217,7 @@ config ARCH_REALVIEW
         select ICST307
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         help
           This enables support for ARM Ltd RealView boards.
 
@@ -229,6 +230,7 @@ config ARCH_VERSATILE
         select ICST307
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         help
           This enables support for ARM Ltd Versatile board.
 
@@ -645,6 +647,18 @@ config ARCH_OMAP
         help
           Support for TI's OMAP platform (OMAP1 and OMAP2).
 
+config ARCH_BCMRING
+        bool "Broadcom BCMRING"
+        depends on MMU
+        select CPU_V6
+        select ARM_AMBA
+        select COMMON_CLKDEV
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        help
+          Support for Broadcom's BCMRing platform.
+
 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
@@ -738,6 +752,8 @@ source "arch/arm/mach-u300/Kconfig"
 
 source "arch/arm/mach-w90x900/Kconfig"
 
+source "arch/arm/mach-bcmring/Kconfig"
+
 # Definitions to make life easier
 config ARCH_ACORN
         bool
@@ -1062,6 +1078,11 @@ config HIGHMEM
 
           If unsure, say n.
 
+config HIGHPTE
+        bool "Allocate 2nd-level pagetables from highmem"
+        depends on HIGHMEM
+        depends on !OUTER_CACHE
+
 source "mm/Kconfig"
 
 config LEDS