diff options
| author | Arnd Bergmann | 2016-07-06 18:00:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2016-07-06 18:00:32 +0200 |
| commit | 7c2d780ec018812333fa726c42acc34cc0be1426 (patch) | |
| tree | 39332a150f6457fb6137930e157eff907d021e99 /arch/arm/mach-u300/Kconfig | |
| parent | ARM: clps711x: Switch to MULTIPLATFORM (diff) | |
| parent | ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB (diff) | |
| download | kernel-qcow2-linux-7c2d780ec018812333fa726c42acc34cc0be1426.tar.gz kernel-qcow2-linux-7c2d780ec018812333fa726c42acc34cc0be1426.tar.xz kernel-qcow2-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-u300/Kconfig')
| -rw-r--r-- | arch/arm/mach-u300/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index 301a98498453..56e0ef680b79 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig @@ -1,11 +1,11 @@ menuconfig ARCH_U300 bool "ST-Ericsson U300 Series" depends on ARCH_MULTI_V5 && MMU - select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select ARM_VIC select CLKSRC_MMIO select CPU_ARM926T + select GPIOLIB select HAVE_TCM select PINCTRL select PINCTRL_COH901 |