diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-15 15:56:04 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-15 15:56:04 +0400 |
| commit | 844ec3142af3b8fd7b9aa95886015eabed80983e (patch) | |
| tree | 77ad6fe364195d9ccb8ec661be937dfcad38b3a3 /sound/soc/codecs/Kconfig | |
| parent | 645e903528ca6cd510f9ac71a6a23de1a4d931e3 (diff) | |
| parent | 497d496598f411cb7f0690725a0e8b9029cebdb9 (diff) | |
| download | linux-844ec3142af3b8fd7b9aa95886015eabed80983e.tar.xz | |
Merge branch 'fix/asoc' into for-linus
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 select SND_SOC_CX20442 select SND_SOC_DA7210 if I2C select SND_SOC_DFBMCS320 - select SND_SOC_JZ4740_CODEC if SOC_JZ4740 + select SND_SOC_JZ4740_CODEC select SND_SOC_LM4857 if I2C select SND_SOC_MAX98088 if I2C select SND_SOC_MAX98095 if I2C |