Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / mach-bcm / Kconfig

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 4f1709b318226aa9c65c920106ac310d055e30f7..5f63f513d9c95473b878936d6584d0e6fc39fea9 100644 (file)
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -17,7 +17,7 @@ config ARCH_BCM_IPROC
        select ARM_GLOBAL_TIMER
        select COMMON_CLK_IPROC
        select CLKSRC_MMIO
-       select ARCH_REQUIRE_GPIOLIB
+       select GPIOLIB
        select ARM_AMBA
        select PINCTRL
        help
@@ -80,7 +80,7 @@ comment "KONA architected SoCs"
 
 config ARCH_BCM_MOBILE
        bool
-       select ARCH_REQUIRE_GPIOLIB
+       select GPIOLIB
        select ARM_ERRATA_754322
        select ARM_ERRATA_775420
        select ARM_GIC
@@ -138,7 +138,7 @@ comment "Other Architectures"
 config ARCH_BCM2835
        bool "Broadcom BCM2835 family"
        depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
-       select ARCH_REQUIRE_GPIOLIB
+       select GPIOLIB
        select ARM_AMBA
        select ARM_ERRATA_411920 if ARCH_MULTI_V6
        select ARM_TIMER_SP804
@@ -178,7 +178,6 @@ config ARCH_BRCMSTB
        select BRCMSTB_L2_IRQ
        select BCM7120_L2_IRQ
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
-       select ARCH_WANT_OPTIONAL_GPIOLIB
        select SOC_BRCMSTB
        select SOC_BUS
        help