commit 076b01d3f65305b90a5224aeee95a1bae304fa61
author Olof Johansson <olof@lixom.net> Mon Jan 16 22:43:17 2017 -0800
committer Olof Johansson <olof@lixom.net> Mon Jan 16 22:43:17 2017 -0800
tree 192ebe778623737702173fc1661e7007a982510e
parent a121103c922847ba5010819a3f250f1f7fc84ab8
parent 299d2f0238ec75bd13cc8c69a4cd6dbb9e7837be

Merge tag 'mvebu-defconfig64-4.11-1' of git://git.infradead.org/linux-mvebu into next/arm64

mvebu defconfig64 for 4.11 (part 1)

Update arm64 defconfig by adding XORv2 for Marvell Armada 7K/8K

* tag 'mvebu-defconfig64-4.11-1' of git://git.infradead.org/linux-mvebu:
  arm64: defconfig: enable XORv2 for Marvell Armada 7K/8K

Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm64/configs/defconfig

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 33b744d..aa9c04f 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -410,6 +410,7 @@
 CONFIG_RTC_DRV_XGENE=y
 CONFIG_RTC_DRV_S3C=y
 CONFIG_DMADEVICES=y
+CONFIG_MV_XOR_V2=y
 CONFIG_PL330_DMA=y
 CONFIG_DMA_BCM2835=m
 CONFIG_TEGRA20_APB_DMA=y