diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-11 02:43:13 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-11 02:43:13 -0400 |
| commit | c6774bcd33b21d57457d4c604388670efdf03258 (patch) | |
| tree | 71240ff9b0754be01350355a38604d1f932eceec /sound/soc/imx/Kconfig | |
| parent | 6b4e9012961cb9be82bae4258f34e33da32340a4 (diff) | |
| parent | 2e2211a387e70c62e1249822a94f4a33933ecd62 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/imx/Kconfig')
| -rw-r--r-- | sound/soc/imx/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index 52dac5e3874c..687c76fc0839 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig | |||
| @@ -28,7 +28,9 @@ config SND_SOC_PHYCORE_AC97 | |||
| 28 | 28 | ||
| 29 | config SND_SOC_EUKREA_TLV320 | 29 | config SND_SOC_EUKREA_TLV320 |
| 30 | tristate "Eukrea TLV320" | 30 | tristate "Eukrea TLV320" |
| 31 | depends on MACH_EUKREA_MBIMX27_BASEBOARD || MACH_EUKREA_MBIMXSD_BASEBOARD | 31 | depends on MACH_EUKREA_MBIMX27_BASEBOARD \ |
| 32 | || MACH_EUKREA_MBIMXSD25_BASEBOARD \ | ||
| 33 | || MACH_EUKREA_MBIMXSD35_BASEBOARD | ||
| 32 | select SND_SOC_TLV320AIC23 | 34 | select SND_SOC_TLV320AIC23 |
| 33 | help | 35 | help |
| 34 | Enable I2S based access to the TLV320AIC23B codec attached | 36 | Enable I2S based access to the TLV320AIC23B codec attached |