diff options
| author | Olof Johansson | 2013-06-14 17:45:39 -0700 |
|---|---|---|
| committer | Olof Johansson | 2013-06-14 17:45:39 -0700 |
| commit | 38d77ff90a47d198d2fd3ebd766ee84eaa71a0d2 (patch) | |
| tree | 7adc209e84f7c45fba521d3430350d8a70ac4a75 /arch/arm/Kconfig | |
| parent | 2c3165ebb641e0ff3faf1c87ed1c8fbd85871da0 (diff) | |
| parent | 159f8a0209aff155af7f6fcdedd4a4484dd19c23 (diff) | |
Merge tag 'renesas-gpio-rcar-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
From Simon Horman:
Renesas ARM based SoC GPIO R-Car updates for v3.11
DT support to GPIO R-Car driver by Laurent Pinchart.
* tag 'renesas-gpio-rcar-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (131 commits)
gpio-rcar: Add DT support
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0574901dd744..4dff801c22eb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -645,7 +645,7 @@ config ARCH_SHMOBILE select MULTI_IRQ_HANDLER select NEED_MACH_MEMORY_H select NO_IOPORT - select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB + select PINCTRL select PM_GENERIC_DOMAINS if PM select SPARSE_IRQ help |