Merge tag 'gpio-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index aa83003..acb8070 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -389,7 +389,6 @@ config ARCH_GEMINI
        select CLKSRC_MMIO
        select CPU_FA526
        select GENERIC_CLOCKEVENTS
-       select NEED_MACH_GPIO_H
        help
          Support for the Cortina Systems Gemini family SoCs
 
@@ -458,7 +457,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
@@ -471,7 +470,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
@@ -560,7 +559,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
@@ -623,7 +621,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