diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 21:17:59 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 21:17:59 +0200 |
commit | 87411bbcb44ebf4d1de041ae35c60e8ce1470b79 (patch) | |
tree | c47c7de0c0bb6245211a7a6f3e5c32045ded4c48 | |
parent | 8cb555b603f386cdde77d0377318eb7051918045 (diff) | |
parent | 371feaff9980a7060f9fea5c795381aaea5f941d (diff) | |
download | op-kernel-dev-87411bbcb44ebf4d1de041ae35c60e8ce1470b79.zip op-kernel-dev-87411bbcb44ebf4d1de041ae35c60e8ce1470b79.tar.gz |
Merge tag 'samsung-defconfig64-4.7' of git://git.kernel.org/pub/scm/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
-rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 5091d35..7aa500b 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -238,6 +238,7 @@ CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_XGENE=y CONFIG_DMADEVICES=y +CONFIG_PL330_DMA=y CONFIG_TEGRA20_APB_DMA=y CONFIG_QCOM_BAM_DMA=y CONFIG_RCAR_DMAC=y |