diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-06 18:00:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-06 18:00:32 +0200 |
| commit | 7c2d780ec018812333fa726c42acc34cc0be1426 (patch) | |
| tree | 39332a150f6457fb6137930e157eff907d021e99 /arch/arm/mach-oxnas | |
| parent | c86f51737f8dedbfc2b8566b15231d4ff6d6ac59 (diff) | |
| parent | 5c34a4e89c743339f78cafb2f2a826a010f0746a (diff) | |
| download | blackbird-op-linux-7c2d780ec018812333fa726c42acc34cc0be1426.tar.gz blackbird-op-linux-7c2d780ec018812333fa726c42acc34cc0be1426.zip | |
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>
Diffstat (limited to 'arch/arm/mach-oxnas')
| -rw-r--r-- | arch/arm/mach-oxnas/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-oxnas/Kconfig b/arch/arm/mach-oxnas/Kconfig index 19164d729d2a..567496bd250a 100644 --- a/arch/arm/mach-oxnas/Kconfig +++ b/arch/arm/mach-oxnas/Kconfig @@ -1,7 +1,7 @@ menuconfig ARCH_OXNAS bool "Oxford Semiconductor OXNAS Family SoCs" - select ARCH_REQUIRE_GPIOLIB select ARCH_HAS_RESET_CONTROLLER + select GPIOLIB select PINCTRL depends on ARCH_MULTI_V5 help |
