diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-03 16:15:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-03 16:15:23 +0100 |
| commit | 478b77461a88304ad1566c042d6aa141815ba19f (patch) | |
| tree | f6e0ff2d0e5d6ec6ac8b0d7dc4f503ef0ced2d8a /sound/soc/codecs/Kconfig | |
| parent | f116d2ffb9ed4ccce169aacb46a421fb802245c6 (diff) | |
| parent | 0e15bdfd8b1e3a94862522580161a2d1bb3882a7 (diff) | |
| download | linux-stable-478b77461a88304ad1566c042d6aa141815ba19f.tar.gz linux-stable-478b77461a88304ad1566c042d6aa141815ba19f.tar.bz2 linux-stable-478b77461a88304ad1566c042d6aa141815ba19f.zip | |
Merge remote-tracking branch 'asoc/topic/zx-aud96p22' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index f0f794186186..6c78b0b49b81 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1119,6 +1119,11 @@ config SND_SOC_WM9713 tristate select REGMAP_AC97 +config SND_SOC_ZX_AUD96P22 + tristate "ZTE ZX AUD96P22 CODEC" + depends on I2C + select REGMAP_I2C + # Amp config SND_SOC_LM4857 tristate |