summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2016-08-15 19:34:44 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-14 22:40:59 +0200
commit7ccb8e633cfeb7969eba09bbf53346e746bb7f89 (patch)
tree80ebd4d10577d11147475c8b7d998a7ef8b595bc /arch
parent56fe27beeb158e2046c10df0d5eb8292ecaf78c0 (diff)
downloadlinux-7ccb8e633cfeb7969eba09bbf53346e746bb7f89.tar.bz2
ARM: multi_v7_defconfig: update XILINX_VDMA
Commit fde57a7c4474 ("dmaengine: xilinx: Rename driver and config") renamed config XILINX_VDMA to config XILINX_DMA Update defconfig accordingly. Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 2c8665cd9dc5..ea3566fb92e2 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -781,7 +781,7 @@ CONFIG_MXS_DMA=y
CONFIG_DMA_BCM2835=y
CONFIG_DMA_OMAP=y
CONFIG_QCOM_BAM_DMA=y
-CONFIG_XILINX_VDMA=y
+CONFIG_XILINX_DMA=y
CONFIG_DMA_SUN6I=y
CONFIG_STAGING=y
CONFIG_SENSORS_ISL29018=y