Merge ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB changes into next/soc
authorArnd Bergmann <arnd@arndb.de>
Wed, 6 Jul 2016 16:00:32 +0000 (18:00 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 6 Jul 2016 16:00:32 +0000 (18:00 +0200)
commit7c2d780ec018812333fa726c42acc34cc0be1426
tree39332a150f6457fb6137930e157eff907d021e99
parentc86f51737f8dedbfc2b8566b15231d4ff6d6ac59
parent5c34a4e89c743339f78cafb2f2a826a010f0746a
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>
arch/arm/Kconfig
arch/arm/mach-bcm/Kconfig
arch/arm/mach-omap2/Kconfig
arch/arm/mach-oxnas/Kconfig