Merge tag 'samsung-defconfig64-4.7' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "Defconfig ARM64 changes for Exynos based boards for v4.7" from Krzysztof Kozlowski:
1. Enable the PL330 DMA driver.

* tag 'samsung-defconfig64-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: defconfig: Enable PL330 DMA controller

diff --cc arch/arm64/configs/defconfig
index 5091d3577e75e2a492513115039cee336076b410,60e5886309d9d485785a2668a1b48b06c98e9bc9..7aa500b57d59ac11229ddad8002721f5823803ab
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -238,8 -229,9 +238,9 @@@ CONFIG_RTC_DRV_PL031=
  CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_XGENE=y
  CONFIG_DMADEVICES=y
 -CONFIG_QCOM_BAM_DMA=y
+ CONFIG_PL330_DMA=y
  CONFIG_TEGRA20_APB_DMA=y
 +CONFIG_QCOM_BAM_DMA=y
  CONFIG_RCAR_DMAC=y
  CONFIG_VFIO=y
  CONFIG_VFIO_PCI=y