diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-11-08 17:54:35 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-11-08 17:54:35 +0100 |
| commit | 79351d5db8cc7a4cb0ac6e5b595f908bc318dc3c (patch) | |
| tree | e1e0a69160ac4f2d8a6ae4529a8d7af404ca4c03 /arch | |
| parent | Linux 4.20-rc1 (diff) | |
| parent | ARM: omap2plus_defconfig: Add tlv320aic23 as module (diff) | |
| download | linux-79351d5db8cc7a4cb0ac6e5b595f908bc318dc3c.tar.xz linux-79351d5db8cc7a4cb0ac6e5b595f908bc318dc3c.zip | |
Merge branch 'omap-for-v4.20/defconfig' into omap-for-v4.21/defconfig
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 6491419b1dad..21cabb7ad970 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -389,6 +389,7 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m CONFIG_SND_SOC_CPCAP=m +CONFIG_SND_SOC_TLV320AIC23_I2C=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m CONFIG_HID_GENERIC=m |