Skip to content

Commit d7a9c59

Browse files
committed
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/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents a9541fb + f166795 commit d7a9c59

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm64/configs/defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ CONFIG_RTC_DRV_SNVS=m
683683
CONFIG_RTC_DRV_IMX_SC=m
684684
CONFIG_RTC_DRV_XGENE=y
685685
CONFIG_DMADEVICES=y
686-
CONFIG_DMA_BCM2835=m
686+
CONFIG_DMA_BCM2835=y
687687
CONFIG_DMA_SUN6I=m
688688
CONFIG_FSL_EDMA=y
689689
CONFIG_IMX_SDMA=y

0 commit comments

Comments
 (0)