diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:13 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:13 +0200 |
| commit | d4376802999d478a103868d7e7b1f473e4a387af (patch) | |
| tree | c73a34f5b26086bc5b98307b25a8d3e754af88a0 /sound | |
| parent | c7a441bba9de3b4e166b6a4449208bc906d70558 (diff) | |
| parent | e854df613fe934c94a0b39eccb4104e72ccbbded (diff) | |
| download | linux-d4376802999d478a103868d7e7b1f473e4a387af.tar.gz linux-d4376802999d478a103868d7e7b1f473e4a387af.tar.bz2 linux-d4376802999d478a103868d7e7b1f473e4a387af.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/imx/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index eba9b9d257a1..252defea93b5 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -13,9 +13,18 @@ config SND_MXC_SOC_SSI config SND_MXC_SOC_WM1133_EV1 tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" - depends on SND_IMX_SOC && EXPERIMENTAL + depends on SND_IMX_SOC && MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL select SND_SOC_WM8350 select SND_MXC_SOC_SSI help Enable support for audio on the i.MX31ADS with the WM1133-EV1 PMIC board with WM8835x fitted. + +config SND_SOC_PHYCORE_AC97 + tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards" + depends on MACH_PCM043 || MACH_PCA100 + select SND_MXC_SOC_SSI + select SND_SOC_WM9712 + help + Say Y if you want to add support for SoC audio on Phytec phyCORE + and phyCARD boards in AC97 mode |