diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 11:28:30 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 11:28:30 -0800 |
| commit | f877df2bcf916ce76851b0f0a669512aa8183446 (patch) | |
| tree | 2bc08cd2de0f8f5fdee73b1e83df186b6821bb60 | |
| parent | d622bbfcaeeb32408a506225db594265cddf3f6f (diff) | |
| parent | 8f039f9a692ab7014e2818a4e372231e134553f9 (diff) | |
| download | op-kernel-dev-f877df2bcf916ce76851b0f0a669512aa8183446.zip op-kernel-dev-f877df2bcf916ce76851b0f0a669512aa8183446.tar.gz | |
Merge tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/soc
arm: Xilinx Zynq patches for v4.5
- Select reset controller by default for Zynq
* tag 'zynq-soc-for-4.5' of https://github.com/Xilinx/linux-xlnx:
ARM: zynq: Select ARCH_HAS_RESET_CONTROLLER
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-zynq/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 78e5e00..77d7df7 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -1,5 +1,6 @@ config ARCH_ZYNQ bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7 + select ARCH_HAS_RESET_CONTROLLER select ARCH_SUPPORTS_BIG_ENDIAN select ARM_AMBA select ARM_GIC |
