1 files changed, 31 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7a96ad317dcd..d778a699f577 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -228,6 +228,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.
 
@@ -240,6 +241,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.
 
@@ -518,10 +520,18 @@ config ARCH_W90X900
         select CPU_ARM926T
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_GPIO
+        select HAVE_CLK
         select COMMON_CLKDEV
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
         help
-                Support for Nuvoton (Winbond logic dept.) ARM9 processor,You
-                can login www.mcuos.com or www.nuvoton.com to know more.
+          Support for Nuvoton (Winbond logic dept.) ARM9 processor,
+          At present, the w90x900 has been renamed nuc900, regarding
+          the ARM series product line, you can login the following
+          link address to know more.
+
+          <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
+                ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
 
 config ARCH_PNX4008
         bool "Philips Nexperia PNX4008 Mobile"
@@ -675,6 +685,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"
@@ -775,6 +797,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
@@ -1103,6 +1127,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