summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-04-29 09:46:45 -0700
committerOlof Johansson <olof@lixom.net>2019-04-29 09:46:45 -0700
commit5f08da63d7563ee92af039074550f5d80c52983d (patch)
treeb86bf927cab315ec8b85136a96a49e445e31e2d6
parent50676063ddf72ef088123eaf548a1e61a950efb4 (diff)
parent04eb7fd961bc8ea587cb5cc8639491c7d3d38471 (diff)
downloadlinux-stable-5f08da63d7563ee92af039074550f5d80c52983d.tar.gz
linux-stable-5f08da63d7563ee92af039074550f5d80c52983d.tar.bz2
linux-stable-5f08da63d7563ee92af039074550f5d80c52983d.zip
Merge tag 'mvebu-arm64-5.2-1' of git://git.infradead.org/linux-mvebu into arm/defconfig
mvebu arm64 for 5.2 (part 1) - Update the defconfig to enable the mv-xor driver found on the Armada 3700 * tag 'mvebu-arm64-5.2-1' of git://git.infradead.org/linux-mvebu: arm64: defconfig: enable mv-xor driver Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm64/configs/defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 8eba976c11a5..5392c12ef3b7 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -614,6 +614,7 @@ CONFIG_RTC_DRV_XGENE=y
CONFIG_DMADEVICES=y
CONFIG_DMA_BCM2835=m
CONFIG_K3_DMA=y
+CONFIG_MV_XOR=y
CONFIG_MV_XOR_V2=y
CONFIG_PL330_DMA=y
CONFIG_TEGRA20_APB_DMA=y