Merge tag 'v4.14-rockchip-soc32-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 24 Aug 2017 13:54:33 +0000 (15:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 24 Aug 2017 13:54:33 +0000 (15:54 +0200)
Pull "second round of Rockchip soc32 changes for 4.14" from Heiko Stübner:

Enable the ARCH_DMA_ADDR_T_64BIT kconfig option for LPAE builds,
as some peripherals like the Mali gpu do support 64bit dma addresses.

* tag 'v4.14-rockchip-soc32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: select ARCH_DMA_ADDR_T_64BIT for LPAE


Trivial merge