diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-17 07:43:17 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-17 07:43:17 +0100 |
| commit | 076b01d3f65305b90a5224aeee95a1bae304fa61 (patch) | |
| tree | 192ebe778623737702173fc1661e7007a982510e /arch/arm64 | |
| parent | Linux 4.10-rc3 (diff) | |
| parent | arm64: defconfig: enable XORv2 for Marvell Armada 7K/8K (diff) | |
| download | linux-076b01d3f65305b90a5224aeee95a1bae304fa61.tar.xz linux-076b01d3f65305b90a5224aeee95a1bae304fa61.zip | |
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>
Diffstat (limited to 'arch/arm64')
| -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 33b744d54739..aa9c04f415c2 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -410,6 +410,7 @@ CONFIG_RTC_DRV_TEGRA=y 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 |