OSDN Git Service

Merge tag 'arm-soc/for-5.6/defconfig-arm64-fixes' of https://github.com/Broadcom...
authorOlof Johansson <olof@lixom.net>
Tue, 11 Feb 2020 22:49:37 +0000 (14:49 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Feb 2020 22:49:38 +0000 (14:49 -0800)
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.com
Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm64/configs/defconfig

Simple merge