diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 12:29:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 12:29:39 -0400 |
| commit | 84b37df4198f8e68a731f1d7daac3465cbbea241 (patch) | |
| tree | 59356686a77af1d39514c9868cfb2e34fb502605 /sound/soc/codecs/Kconfig | |
| parent | 95977d0ef23ee37990ce8704dfd6c61eab02a548 (diff) | |
| parent | 41f9a314af9c1f24b595f73ae73ee23db6d5e6a8 (diff) | |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Select wm_hubs automatically for WM8994
ASoC: Remove duplicate AUX definition from WM8776
ASoC:: remove a redundant snd_soc_unregister_codec call in wm8988_register
ASoC: wm8727: add a missing return in wm8727_platform_probe
ASoC: fsi: fixup wrong value setting order of TDM
ASoC: fsi: fixup clock inversion operation
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 31ac5538fe7e..5da30eb6ad00 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -83,8 +83,8 @@ config SND_SOC_ALL_CODECS | |||
| 83 | 83 | ||
| 84 | config SND_SOC_WM_HUBS | 84 | config SND_SOC_WM_HUBS |
| 85 | tristate | 85 | tristate |
| 86 | default y if SND_SOC_WM8993=y | 86 | default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y |
| 87 | default m if SND_SOC_WM8993=m | 87 | default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m |
| 88 | 88 | ||
| 89 | config SND_SOC_AC97_CODEC | 89 | config SND_SOC_AC97_CODEC |
| 90 | tristate | 90 | tristate |