summaryrefslogtreecommitdiff
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-05-21 23:54:21 +0200
committerArnd Bergmann <arnd@arndb.de>2020-05-21 23:54:22 +0200
commit93d2fa6a035be8d697bc837dfe4f672c41943041 (patch)
tree6df0ef3139c96f86a24c2b6a4c26c099db36bd85 /arch/arm64/configs
parent72a790ac7c9911792ef226f7ca959886c118518b (diff)
parent38f58fc51d12b25f9aab9afa2e6f58227c950d9e (diff)
downloadlwn-93d2fa6a035be8d697bc837dfe4f672c41943041.tar.gz
lwn-93d2fa6a035be8d697bc837dfe4f672c41943041.zip
Merge tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/defconfig
arm64: defconfig: Amlogic updates for v5.8 - enable meson gx audio as module * tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: arm64: defconfig: enable meson gx audio as module Link: https://lore.kernel.org/r/5ec6f4f6.1c69fb81.3fe34.b693@mx.google.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index b3277fe5db8b..9150a4d0ca55 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -650,6 +650,7 @@ CONFIG_SND_HDA_CODEC_HDMI=m
CONFIG_SND_SOC=y
CONFIG_SND_BCM2835_SOC_I2S=m
CONFIG_SND_MESON_AXG_SOUND_CARD=m
+CONFIG_SND_MESON_GX_SOUND_CARD=m
CONFIG_SND_SOC_SDM845=m
CONFIG_SND_SOC_ROCKCHIP=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
@@ -662,6 +663,7 @@ CONFIG_SND_SOC_AK4613=m
CONFIG_SND_SOC_ES7134=m
CONFIG_SND_SOC_ES7241=m
CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
CONFIG_SND_SOC_TAS571X=m
CONFIG_SND_SOC_WCD934X=m
CONFIG_SND_SOC_WSA881X=m