diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 13:28:27 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 13:28:27 (GMT) |
| commit | 0b1107b29b1c7c96ce5b2cae4115e336dbdfe8e7 (patch) | |
| tree | adbea87e0dbdfa0047412a7f76f5b0e73b760d53 /sound/soc/codecs/Kconfig | |
| parent | 3e4ea1f98980568334a98d93302a09a7ff53271e (diff) | |
| parent | c5efb38a1354890297aed2a7e197ec5b23ce966a (diff) | |
| download | linux-0b1107b29b1c7c96ce5b2cae4115e336dbdfe8e7.tar.xz | |
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c8aa1d6..28eed91 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -123,6 +123,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8994 if MFD_WM8994 select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8996 if I2C + select SND_SOC_WM8997 if MFD_WM8997 select SND_SOC_WM9081 if I2C select SND_SOC_WM9090 if I2C select SND_SOC_WM9705 if SND_SOC_AC97_BUS @@ -146,8 +147,10 @@ config SND_SOC_ARIZONA tristate default y if SND_SOC_WM5102=y default y if SND_SOC_WM5110=y + default y if SND_SOC_WM8997=y default m if SND_SOC_WM5102=m default m if SND_SOC_WM5110=m + default m if SND_SOC_WM8997=m config SND_SOC_WM_HUBS tristate @@ -504,6 +507,9 @@ config SND_SOC_WM8995 config SND_SOC_WM8996 tristate +config SND_SOC_WM8997 + tristate + config SND_SOC_WM9081 tristate |