Merge remote-tracking branch 'gpio/for-next'

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b6a708ef6067124e3b8b7e3d0cc8aebccb72787d..e64b97c8f0fe556681a476752baf8dcd8a7ea456 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -58,6 +58,7 @@ config ARM
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_UID16
+       select HAVE_VIRT_CPU_ACCOUNTING_GEN
        select IRQ_FORCED_THREADING
        select KTIME_SCALAR
        select MODULES_USE_ELF_REL
@@ -392,7 +393,6 @@ config ARCH_GEMINI
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_USES_GETTIMEOFFSET
        select CPU_FA526
-       select NEED_MACH_GPIO_H
        help
          Support for the Cortina Systems Gemini family SoCs
 
@@ -461,7 +461,7 @@ config ARCH_IOP32X
        depends on MMU
        select ARCH_REQUIRE_GPIOLIB
        select CPU_XSCALE
-       select NEED_MACH_GPIO_H
+       select GPIO_IOP
        select NEED_RET_TO_USER
        select PCI
        select PLAT_IOP
@@ -474,7 +474,7 @@ config ARCH_IOP33X
        depends on MMU
        select ARCH_REQUIRE_GPIOLIB
        select CPU_XSCALE
-       select NEED_MACH_GPIO_H
+       select GPIO_IOP
        select NEED_RET_TO_USER
        select PCI
        select PLAT_IOP
@@ -563,7 +563,6 @@ config ARCH_MMP
        select GPIO_PXA
        select IRQ_DOMAIN
        select MULTI_IRQ_HANDLER
-       select NEED_MACH_GPIO_H
        select PINCTRL
        select PLAT_PXA
        select SPARSE_IRQ
@@ -626,7 +625,6 @@ config ARCH_PXA
        select GPIO_PXA
        select HAVE_IDE
        select MULTI_IRQ_HANDLER
-       select NEED_MACH_GPIO_H
        select PLAT_PXA
        select SPARSE_IRQ
        help