From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 26 Jan 2018 16:33:36 +0000 (+0100)
Subject: Merge tag 'zynqmp-soc-fixes-for-4.16' of https://github.com/Xilinx/linux-xlnx into... 
X-Git-Tag: v4.16-rc1~98^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9db16401d2d2e651fe1ca55ccb32e9bef402b411;p=uclinux-h8%2Flinux.git

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
---

9db16401d2d2e651fe1ca55ccb32e9bef402b411