diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-04 08:35:43 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-04 08:35:43 +0300 |
| commit | d2c032e3dc58137a7261a7824d3acce435db1d66 (patch) | |
| tree | 7eea1c7c6103eefe879f07472eec99b3c41eb792 /arch/arm/mach-zynq/Kconfig | |
| parent | 7e8e385aaf6ed5b64b5d9108081cfcdcdd021b78 (diff) | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
| download | linux-d2c032e3dc58137a7261a7824d3acce435db1d66.tar.xz | |
Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-zynq/Kconfig')
| -rw-r--r-- | arch/arm/mach-zynq/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index aaa5162c1509..78e5e007f52d 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -9,6 +9,8 @@ config ARCH_ZYNQ select HAVE_ARM_TWD if SMP select ICST select MFD_SYSCON + select PINCTRL + select PINCTRL_ZYNQ select SOC_BUS help Support for Xilinx Zynq ARM Cortex A9 Platform |