Merge branch 'orion' into devel

[karo-tx-linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e53b0ed9d00a39718c2010f6bf44538f3df15742..6835a4c8affafd7810c36ca23ae1f84a9fe21467 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -334,6 +334,16 @@ config ARCH_MXC
        help
          Support for Freescale MXC/iMX-based family of processors
 
+config ARCH_ORION
+       bool "Marvell Orion"
+       depends on MMU
+       select PCI
+       select GENERIC_GPIO
+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS
+       help
+         Support for Marvell Orion System on Chip family.
+
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
        help
@@ -454,6 +464,8 @@ source "arch/arm/mach-omap1/Kconfig"
 
 source "arch/arm/mach-omap2/Kconfig"
 
+source "arch/arm/mach-orion/Kconfig"
+
 source "arch/arm/plat-s3c24xx/Kconfig"
 source "arch/arm/plat-s3c/Kconfig"
 
@@ -732,7 +744,7 @@ config LEDS
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
                   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
-                  ARCH_KS8695
+                  ARCH_KS8695 || MACH_RD88F5182
        help
          If you say Y here, the LEDs on your machine will be used
          to provide useful information about your current system status.
@@ -967,7 +979,7 @@ config FPE_FASTFPE
 
 config VFP
        bool "VFP-format floating point maths"
-       depends on CPU_V6 || CPU_ARM926T || CPU_V7
+       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.