Commit d7a9c595 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'arm-soc/for-5.6/defconfig-arm64-fixes' of...

Merge tag 'arm-soc/for-5.6/defconfig-arm64-fixes' of https://github.com/Broadcom/stblinux into arm/fixes

This pull request contains ARM64 defconfig changes for v5.6, please pull
the following:

- Nicolas enables the BCM2835 DMA engine controller as built-in since
  the bcm2835 SD host controller depends on the DMA engine to be
  available.

* tag 'arm-soc/for-5.6/defconfig-arm64-fixes' of https://github.com/Broadcom/stblinux:
  arm64: defconfig: Set bcm2835-dma as built-in

Link: https://lore.kernel.org/r/20200210145621.22599-1-f.fainelli@gmail.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a9541fb7 f1667958
......@@ -683,7 +683,7 @@ CONFIG_RTC_DRV_SNVS=m
CONFIG_RTC_DRV_IMX_SC=m
CONFIG_RTC_DRV_XGENE=y
CONFIG_DMADEVICES=y
CONFIG_DMA_BCM2835=m
CONFIG_DMA_BCM2835=y
CONFIG_DMA_SUN6I=m
CONFIG_FSL_EDMA=y
CONFIG_IMX_SDMA=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment