1 files changed, 38 insertions, 24 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d7c0984d4a86..e55bbd32dcac 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -114,9 +114,6 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
-config GENERIC_BUST_SPINLOCK
-        bool
-
 config ARCH_MAY_HAVE_PC_FDC
         bool
 
@@ -247,6 +244,15 @@ config ARCH_IMX
         help
           Support for Motorola's i.MX family of processors (MX1, MXL).
 
+config ARCH_IOP13XX
+        bool "IOP13xx-based"
+        depends on MMU
+        select PLAT_IOP
+        select PCI
+        select ARCH_SUPPORTS_MSI
+        help
+          Support for Intel's IOP13XX (XScale) family of processors.
+
 config ARCH_IOP32X
         bool "IOP32x-based"
         depends on MMU
@@ -264,22 +270,12 @@ config ARCH_IOP33X
         help
           Support for Intel's IOP33X (XScale) family of processors.
 
-config ARCH_IOP13XX
-        bool "IOP13xx-based"
-        depends on MMU
-        select PLAT_IOP
-        select PCI
-        select ARCH_SUPPORTS_MSI
-        help
-          Support for Intel's IOP13XX (XScale) family of processors.
-
-config ARCH_IXP4XX
-        bool "IXP4xx-based"
+config ARCH_IXP23XX
+        bool "IXP23XX-based"
         depends on MMU
-        select GENERIC_TIME
-        select GENERIC_CLOCKEVENTS
+        select PCI
         help
-          Support for Intel's IXP4XX (XScale) family of processors.
+          Support for Intel's IXP23xx (XScale) family of processors.
 
 config ARCH_IXP2000
         bool "IXP2400/2800-based"
@@ -288,12 +284,13 @@ config ARCH_IXP2000
         help
           Support for Intel's IXP2400/2800 (XScale) family of processors.
 
-config ARCH_IXP23XX
-        bool "IXP23XX-based"
+config ARCH_IXP4XX
+        bool "IXP4xx-based"
         depends on MMU
-        select PCI
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
         help
-          Support for Intel's IXP23xx (XScale) family of processors.
+          Support for Intel's IXP4XX (XScale) family of processors.
 
 config ARCH_L7200
         bool "LinkUp-L7200"
@@ -308,6 +305,12 @@ config ARCH_L7200
           If you have any questions or comments about the Linux kernel port
           to this board, send e-mail to <sjhill@cotw.com>.
 
+config ARCH_KS8695
+        bool "Micrel/Kendin KS8695"
+        help
+          Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
+          System-on-Chip devices.
+
 config ARCH_NS9XXX
         bool "NetSilicon NS9xxx"
         help
@@ -354,7 +357,6 @@ config ARCH_SA1100
 config ARCH_S3C2410
         bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
         select GENERIC_GPIO
-        select GENERIC_TIME
         help
           Samsung S3C2410X CPU based systems, such as the Simtec Electronics
           BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -377,6 +379,13 @@ config ARCH_LH7A40X
           core with a wide array of integrated devices for
           hand-held and low-power applications.
 
+config ARCH_DAVINCI
+        bool "TI DaVinci"
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
+        help
+          Support for TI's DaVinci platform.
+
 config ARCH_OMAP
         bool "TI OMAP"
         select GENERIC_GPIO
@@ -445,6 +454,10 @@ source "arch/arm/mach-netx/Kconfig"
 
 source "arch/arm/mach-ns9xxx/Kconfig"
 
+source "arch/arm/mach-davinci/Kconfig"
+
+source "arch/arm/mach-ks8695/Kconfig"
+
 # Definitions to make life easier
 config ARCH_ACORN
         bool
@@ -505,7 +518,7 @@ config ISA_DMA_API
         bool
 
 config PCI
-        bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX
+        bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695
         help
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside
@@ -674,7 +687,8 @@ config LEDS
                    ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                    ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                    ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-                   ARCH_AT91 || MACH_TRIZEPS4
+                   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
+                   ARCH_KS8695
         help
           If you say Y here, the LEDs on your machine will be used
           to provide useful information about your current system status.