diff options
| author | Jiri Kosina | 2011-02-15 10:24:31 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2011-02-15 10:24:31 +0100 |
| commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
| tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 /sound/soc/codecs/Kconfig | |
| parent | MAINTAINERS: fix sorting (diff) | |
| parent | klist: Fix object alignment on 64-bit. (diff) | |
| download | kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.gz kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.xz kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.zip | |
Merge branch 'master' into for-next
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 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 |