diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-01 13:58:18 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-01 13:58:18 -0400 |
| commit | 6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f (patch) | |
| tree | f1324a39f155375221ed88db0626f61b75c51db6 /sound/soc/codecs/Kconfig | |
| parent | fec6dd833e733b5d9588a1f1e4d81118b79b5774 (diff) | |
| parent | 76a6106f124e375df0ea6ba6bcf204b8caff786a (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 658cbe07fb72..8d11fbd1b1aa 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -26,8 +26,9 @@ config SND_SOC_ALL_CODECS | |||
| 26 | select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC | 26 | select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC |
| 27 | select SND_SOC_CS42L51 if I2C | 27 | select SND_SOC_CS42L51 if I2C |
| 28 | select SND_SOC_CS4270 if I2C | 28 | select SND_SOC_CS4270 if I2C |
| 29 | select SND_SOC_CX20442 | ||
| 29 | select SND_SOC_DA7210 if I2C | 30 | select SND_SOC_DA7210 if I2C |
| 30 | select SND_SOC_JZ4740 if SOC_JZ4740 | 31 | select SND_SOC_JZ4740_CODEC if SOC_JZ4740 |
| 31 | select SND_SOC_MAX98088 if I2C | 32 | select SND_SOC_MAX98088 if I2C |
| 32 | select SND_SOC_MAX9877 if I2C | 33 | select SND_SOC_MAX9877 if I2C |
| 33 | select SND_SOC_PCM3008 | 34 | select SND_SOC_PCM3008 |