Merge tag 'usb-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[deliverable/linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f6c185f2d8b0940da84ed59808c0047de14c268e..cdfa6c2b7626f3a761364ac072fc359b5f02592a 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -527,10 +527,10 @@ config ARCH_LPC32XX
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select CLKDEV_LOOKUP
-       select CLKSRC_MMIO
+       select CLKSRC_LPC32XX
+       select COMMON_CLK
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
-       select HAVE_IDE
        select USE_OF
        help
          Support for the NXP LPC32XX family of processors
@@ -547,6 +547,7 @@ config ARCH_PXA
        select CLKSRC_PXA
        select CLKSRC_MMIO
        select CLKSRC_OF
+       select CPU_XSCALE if !CPU_XSC3
        select GENERIC_CLOCKEVENTS
        select GPIO_PXA
        select HAVE_IDE
@@ -622,6 +623,7 @@ config ARCH_DAVINCI
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
+       select CPU_ARM926T
        select GENERIC_ALLOCATOR
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
@@ -723,6 +725,8 @@ source "arch/arm/mach-mvebu/Kconfig"
 
 source "arch/arm/mach-alpine/Kconfig"
 
+source "arch/arm/mach-artpec/Kconfig"
+
 source "arch/arm/mach-asm9260/Kconfig"
 
 source "arch/arm/mach-at91/Kconfig"
@@ -878,10 +882,16 @@ config ARCH_STM32
        select ARCH_HAS_RESET_CONTROLLER
        select ARMV7M_SYSTICK
        select CLKSRC_STM32
+       select PINCTRL
        select RESET_CONTROLLER
        help
          Support for STMicroelectronics STM32 processors.
 
+config MACH_STM32F429
+       bool "STMicrolectronics STM32F429"
+       depends on ARCH_STM32
+       default y
+
 # Definitions to make life easier
 config ARCH_ACORN
        bool