Commit 0626c46e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-4.20/defconfig' of https://github.com/Broadcom/stblinux into next/defconfig

This pull request contains Broadcom ARM-based SoCs defconfig changes for
4.20, please pull the following:

- Stefan updates the bcm2835_defconfig file to turn on the bcm2835-audio
  driver.

* tag 'arm-soc/for-4.20/defconfig' of https://github.com/Broadcom/stblinux

:
  ARM: bcm2835_defconfig: Enable bcm2835-audio

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 11da3a7f 99fa3b0c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=y
CONFIG_DMADEVICES=y
CONFIG_DMA_BCM2835=y
CONFIG_STAGING=y
CONFIG_BCM2835_VCHIQ=m
CONFIG_SND_BCM2835=m
CONFIG_MAILBOX=y
CONFIG_BCM2835_MBOX=y
# CONFIG_IOMMU_SUPPORT is not set