diff options
| author | Mark Brown <broonie@kernel.org> | 2021-07-11 23:44:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-07-11 23:44:54 +0100 |
| commit | 999abd7a8c5dc52c5bfca71cdba98642dad5a0be (patch) | |
| tree | 9348c31dda877b0acbae44656dfce53d5df41793 /sound/soc/codecs/Kconfig | |
| parent | e73f0f0ee7541171d89f2e2491130c7771ba58d3 (diff) | |
| parent | 9cf76a72af6ab81030dea6481b1d7bdd814fbdaf (diff) | |
Merge existing fixes from asoc/for-5.14
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 7ebae3f09435..9b68c6512fbb 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1325,7 +1325,7 @@ config SND_SOC_SSM2305 high-efficiency mono Class-D audio power amplifiers. config SND_SOC_SSM2518 - tristate + tristate "Analog Devices SSM2518 Class-D Amplifier" depends on I2C config SND_SOC_SSM2602 @@ -1813,11 +1813,6 @@ config SND_SOC_ZL38060 which consists of a Digital Signal Processor (DSP), several Digital Audio Interfaces (DAIs), analog outputs, and a block of 14 GPIOs. -config SND_SOC_ZX_AUD96P22 - tristate "ZTE ZX AUD96P22 CODEC" - depends on I2C - select REGMAP_I2C - # Amp config SND_SOC_LM4857 tristate |