Merge ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB changes into next/soc

* commit '5c34a4e89c743339f78cafb2f2a826a010f0746a':
  ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB
  ARM: uniphier: drop code for old DT binding

These cause a harmless conflict with the clps711x multiplatform
support, and it's easy to resolve.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig
index 7a13e5a,a0af11b..774ad8b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -353,9 -351,22 +351,8 @@@ config ARM_SINGLE_ARMV7
        select SPARSE_IRQ
        select USE_OF
  
 -
 -config ARCH_CLPS711X
 -      bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
 -      select AUTO_ZRELADDR
 -      select CLKSRC_MMIO
 -      select COMMON_CLK
 -      select CPU_ARM720T
 -      select GENERIC_CLOCKEVENTS
 -      select GPIOLIB
 -      select MFD_SYSCON
 -      select SOC_BUS
 -      help
 -        Support for Cirrus Logic 711x/721x/731x based boards.
 -
  config ARCH_GEMINI
        bool "Cortina Systems Gemini"
-       select ARCH_REQUIRE_GPIOLIB
        select CLKSRC_MMIO
        select CPU_FA526
        select GENERIC_CLOCKEVENTS

diff --cc arch/arm/mach-bcm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-oxnas/Kconfig
Simple merge