diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-12-08 17:14:57 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-12-08 17:14:58 +0100 |
commit | 69f7aeee06674daa1950e04dc61de0c6e70586fc (patch) | |
tree | db772417a8c6a6b76c45f621aea3356ba1930c92 /arch/arm64/configs/defconfig | |
parent | 11de454b4cac7ac92e93d3e3853c7ab8ad00a2c9 (diff) | |
parent | 0536f70989601c64c162107354a03112ab1bb9e6 (diff) |
Merge tag 'sunxi-config64-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig
One patch to enable the Allwinner I2S controller on arm64's defconfig
* tag 'sunxi-config64-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm64: defconfig: Enable Allwinner i2s driver
Link: https://lore.kernel.org/r/5ddf5486-a20c-467a-bc67-d5e8fbc38856.lettre@localhost
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/configs/defconfig')
-rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 24ee4ac17252..305149765468 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -707,6 +707,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_SAMSUNG=y CONFIG_SND_SOC_RCAR=m +CONFIG_SND_SUN4I_I2S=m CONFIG_SND_SUN4I_SPDIF=m CONFIG_SND_SOC_TEGRA=m CONFIG_SND_SOC_TEGRA210_AHUB=m |