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-imx | |
parent | c86f51737f8dedbfc2b8566b15231d4ff6d6ac59 (diff) | |
parent | 5c34a4e89c743339f78cafb2f2a826a010f0746a (diff) | |
download | linux-7c2d780ec018812333fa726c42acc34cc0be1426.tar.gz linux-7c2d780ec018812333fa726c42acc34cc0be1426.tar.bz2 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-imx')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index dd905b9602a0..859e584f1f01 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -1,10 +1,10 @@ menuconfig ARCH_MXC bool "Freescale i.MX family" depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M - select ARCH_REQUIRE_GPIOLIB select ARCH_SUPPORTS_BIG_ENDIAN select CLKSRC_IMX_GPT select GENERIC_IRQ_CHIP + select GPIOLIB select PINCTRL select PM_OPP if PM select SOC_BUS |