summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-18 14:05:44 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-18 14:05:44 +0100
commit27de094f54a4d96bae2cd3121eb157bb8a34f729 (patch)
tree80a6eb8367289961e8a1cb768dd99e46bf9087bb /sound/soc/codecs/Kconfig
parent321051f5daf059e7290aa7d60af55482c8bb896a (diff)
parent7322ce21cde92777a9b11e17429d61d1cda6d2c2 (diff)
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 883a312bb293..c48b23c1d4fc 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -44,7 +44,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 WL1273_CORE
+ select SND_SOC_WL1273 if RADIO_WL1273
select SND_SOC_WM2000 if I2C
select SND_SOC_WM8350 if MFD_WM8350
select SND_SOC_WM8400 if MFD_WM8400