diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 06:29:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 06:29:43 -0400 |
| commit | f94f3cb37a1c4d44dd2070cc4a6165689bda9c92 (patch) | |
| tree | 21bbdeacbc1b9895cf917231d1675eaaa63b9229 /sound/soc/codecs/Kconfig | |
| parent | e27808df97ff7b43b4927aadf410705f33313523 (diff) | |
| parent | 1b4610ebf37a05a65e9f29cdf4d87c207573104d (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
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 3e84b528a88c..b814ed0a1636 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -51,7 +51,7 @@ config SND_SOC_ALL_CODECS | |||
| 51 | select SND_SOC_TWL6040 if TWL4030_CORE | 51 | select SND_SOC_TWL6040 if TWL4030_CORE |
| 52 | select SND_SOC_UDA134X | 52 | select SND_SOC_UDA134X |
| 53 | select SND_SOC_UDA1380 if I2C | 53 | select SND_SOC_UDA1380 if I2C |
| 54 | select SND_SOC_WL1273 if RADIO_WL1273 | 54 | select SND_SOC_WL1273 if MFD_WL1273_CORE |
| 55 | select SND_SOC_WM2000 if I2C | 55 | select SND_SOC_WM2000 if I2C |
| 56 | select SND_SOC_WM8350 if MFD_WM8350 | 56 | select SND_SOC_WM8350 if MFD_WM8350 |
| 57 | select SND_SOC_WM8400 if MFD_WM8400 | 57 | select SND_SOC_WM8400 if MFD_WM8400 |