diff options
| author | Olof Johansson <olof@lixom.net> | 2018-09-25 11:29:40 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-09-25 11:29:40 -0700 |
| commit | 0626c46e1ec36930e16ead3143b67d6c78b08011 (patch) | |
| tree | 33c279338f2f0a083059df1b6cf6397bc32f2e17 /arch/arm/configs | |
| parent | 11da3a7f84f19c26da6f86af878298694ede0804 (diff) | |
| parent | 99fa3b0c6082bff346f7d09f29e5edcc93d40bd3 (diff) | |
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>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index e9bc88937b1e..bb6a35fb1dd7 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -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 |