diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 12:29:43 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 12:29:43 +0200 |
| commit | f94f3cb37a1c4d44dd2070cc4a6165689bda9c92 (patch) | |
| tree | 21bbdeacbc1b9895cf917231d1675eaaa63b9229 /sound/soc/codecs/Kconfig | |
| parent | ASoC: Use data based init for sn95031 DAPM (diff) | |
| parent | Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | linux-f94f3cb37a1c4d44dd2070cc4a6165689bda9c92.tar.xz linux-f94f3cb37a1c4d44dd2070cc4a6165689bda9c92.zip | |
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 select SND_SOC_TWL6040 if TWL4030_CORE select SND_SOC_UDA134X select SND_SOC_UDA1380 if I2C - select SND_SOC_WL1273 if RADIO_WL1273 + select SND_SOC_WL1273 if MFD_WL1273_CORE select SND_SOC_WM2000 if I2C select SND_SOC_WM8350 if MFD_WM8350 select SND_SOC_WM8400 if MFD_WM8400 |