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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2018-09-25 11:29:40 -07:00
+1 -1
View File
@@ -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