diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-16 14:14:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-16 14:14:42 -0500 |
| commit | 5885b9b3f030f9b430f6b1c7fa396c885033f2f8 (patch) | |
| tree | 64a7be8a9159556436075a0ce97fd09e203f3f96 /sound/soc/codecs/Kconfig | |
| parent | 1c5ff0f54dc7f821f3d88b2ddbe0ec623b3317c2 (diff) | |
| parent | 844ec3142af3b8fd7b9aa95886015eabed80983e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: HDA: Use LPIB Position fix for Intel SCH Poulsbo
ALSA: hda: fix mute led polarity for HP laptops with buggy BIOS
ALSA: HDA: Set position fix to LPIB for an Atom/Poulsbo based device
ASoC: Fix hx4700 error handling to free gpios if snd_soc_register_card fails
ASoC: WM8958: correctly show firmware magic on mismatch
ASoC: mxs: Add appropriate MODULE_ALIAS()
ASoC: mxs: Add missing MODULE_LICENSE("GPL")
ASoC: Fix WM8996 24.576MHz clock operation
ASoC: Include linux/module.h for smdk2443_wm9710
ASoC: Fix a typo in jive_wm8750
ASoC: Fix build dependency for SND_SOC_JZ4740_CODEC
ASoC: Include linux/io.h for jz4740 codec
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 4584514d93d4..fa787d45d74a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -33,7 +33,7 @@ config SND_SOC_ALL_CODECS | |||
| 33 | select SND_SOC_CX20442 | 33 | select SND_SOC_CX20442 |
| 34 | select SND_SOC_DA7210 if I2C | 34 | select SND_SOC_DA7210 if I2C |
| 35 | select SND_SOC_DFBMCS320 | 35 | select SND_SOC_DFBMCS320 |
| 36 | select SND_SOC_JZ4740_CODEC if SOC_JZ4740 | 36 | select SND_SOC_JZ4740_CODEC |
| 37 | select SND_SOC_LM4857 if I2C | 37 | select SND_SOC_LM4857 if I2C |
| 38 | select SND_SOC_MAX98088 if I2C | 38 | select SND_SOC_MAX98088 if I2C |
| 39 | select SND_SOC_MAX98095 if I2C | 39 | select SND_SOC_MAX98095 if I2C |