diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-01-26 17:33:36 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-26 17:33:36 +0100 |
| commit | 9db16401d2d2e651fe1ca55ccb32e9bef402b411 (patch) | |
| tree | 2b44cc9cc86d312ad6f33e68ee44c7338e03010c /arch/nios2 | |
| parent | Merge tag 'soc-fsl-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | soc: xilinx: Fix Kconfig alignment (diff) | |
| download | linux-9db16401d2d2e651fe1ca55ccb32e9bef402b411.tar.xz linux-9db16401d2d2e651fe1ca55ccb32e9bef402b411.zip | |
Merge tag 'zynqmp-soc-fixes-for-4.16' of https://github.com/Xilinx/linux-xlnx into next/drivers
Pull "arm: Xilinx ZynqMP SoC fixes for v4.16" from Michal Simek:
- Fix Kconfig dependency
- Fix vcu clkoutdiv calculation
* tag 'zynqmp-soc-fixes-for-4.16' of https://github.com/Xilinx/linux-xlnx:
soc: xilinx: Fix Kconfig alignment
soc: xilinx: xlnx_vcu: Use bitwise & rather than logical && on clkoutdiv
soc: xilinx: xlnx_vcu: Depends on HAS_IOMEM for xlnx_vcu
Diffstat (limited to 'arch/nios2')
0 files changed, 0 insertions, 0 deletions