Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[can-eth-gw-linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index bbd48cc1ad2089ea059d56534c1b4edf23577d41..825066e29c38e75a52aa8cefe8d156f5eb559487 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -332,6 +332,8 @@ config ARCH_AT91
        select IRQ_DOMAIN
        select NEED_MACH_GPIO_H
        select NEED_MACH_IO_H if PCCARD
+       select PINCTRL
+       select PINCTRL_AT91 if USE_OF
        help
          This enables support for systems based on Atmel
          AT91RM9200 and AT91SAM9* processors.
@@ -366,6 +368,7 @@ config ARCH_CNS3XXX
 
 config ARCH_CLPS711X
        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
+       select ARCH_REQUIRE_GPIOLIB
        select ARCH_USES_GETTIMEOFFSET
        select CLKDEV_LOOKUP
        select COMMON_CLK
@@ -549,6 +552,7 @@ config ARCH_KIRKWOOD
        select CPU_FEROCEON
        select GENERIC_CLOCKEVENTS
        select PCI
+       select PCI_QUIRKS
        select PLAT_ORION_LEGACY
        help
          Support for the following Marvell Kirkwood series SoCs:
@@ -588,6 +592,7 @@ config ARCH_MMP
        select GPIO_PXA
        select IRQ_DOMAIN
        select NEED_MACH_GPIO_H
+       select PINCTRL
        select PLAT_PXA
        select SPARSE_IRQ
        help
@@ -906,6 +911,7 @@ config ARCH_NOMADIK
 
 config PLAT_SPEAR
        bool "ST SPEAr"
+       select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select CLKDEV_LOOKUP