diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-01-05 14:19:20 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 14:19:20 +0000 |
| commit | ef2b3d0194cf468d3b956f2515a1946f56a7c604 (patch) | |
| tree | 3d59c7be7ff67de62c77d5e55fa0a0fc94ffa809 /sound/soc/codecs/Kconfig | |
| parent | 1ebf578579bc37783ebe573c56ff166b65927597 (diff) | |
| parent | 99d042d3caa4c503d27d4e4281dc3ca0880bb015 (diff) | |
Automatically merging tracking-igloo_kernel-audio into merge-integration-linux-ux500
Conflicting files:
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index fa787d45d74..a51709b758e 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -103,7 +103,12 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM9705 if SND_SOC_AC97_BUS select SND_SOC_WM9712 if SND_SOC_AC97_BUS select SND_SOC_WM9713 if SND_SOC_AC97_BUS - help + select SND_SOC_AB3550 + select SND_SOC_AB5500 + select SND_SOC_AB8500 + select SND_SOC_CG29XX + select SND_SOC_AV8100 + help Normally ASoC codec drivers are only built if a machine driver which uses them is also built since they are only usable with a machine driver. Selecting this option will allow these drivers to be built @@ -404,6 +409,21 @@ config SND_SOC_WM9712 config SND_SOC_WM9713 tristate +config SND_SOC_AB3550 + tristate + +config SND_SOC_AB5500 + tristate + +config SND_SOC_AB8500 + tristate + +config SND_SOC_CG29XX + tristate + +config SND_SOC_AV8100 + tristate + # Amp config SND_SOC_LM4857 tristate |