From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 25 Apr 2016 19:17:59 +0000 (+0200)
Subject: Merge tag 'samsung-defconfig64-4.7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=87411bbcb44ebf4d1de041ae35c60e8ce1470b79;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'samsung-defconfig64-4.7' of git://git./linux/kernel/git/krzk/linux into next/arm64

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

87411bbcb44ebf4d1de041ae35c60e8ce1470b79
diff --cc arch/arm64/configs/defconfig
index 5091d3577e75,60e5886309d9..7aa500b57d59
--- a/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