diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-18 14:11:23 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-18 14:11:23 -0500 |
| commit | 492e917635a0fa05439bb562fd51577efc9cef30 (patch) | |
| tree | 31557bd3b15e1d79d7287cc3d7ded3875cbeea92 /sound/soc/codecs/Kconfig | |
| parent | 065ae6784f03016ed1c0613863461a162388cf5a (diff) | |
| parent | c88c2823e87dd6f8214b8b8cdc36d45f205a8077 (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index a18cff4afbcc..a9cb2a04ad56 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -45,7 +45,7 @@ config SND_SOC_ALL_CODECS | |||
| 45 | select SND_SOC_TWL6040 if TWL4030_CORE | 45 | select SND_SOC_TWL6040 if TWL4030_CORE |
| 46 | select SND_SOC_UDA134X | 46 | select SND_SOC_UDA134X |
| 47 | select SND_SOC_UDA1380 if I2C | 47 | select SND_SOC_UDA1380 if I2C |
| 48 | select SND_SOC_WL1273 if WL1273_CORE | 48 | select SND_SOC_WL1273 if RADIO_WL1273 |
| 49 | select SND_SOC_WM2000 if I2C | 49 | select SND_SOC_WM2000 if I2C |
| 50 | select SND_SOC_WM8350 if MFD_WM8350 | 50 | select SND_SOC_WM8350 if MFD_WM8350 |
| 51 | select SND_SOC_WM8400 if MFD_WM8400 | 51 | select SND_SOC_WM8400 if MFD_WM8400 |