Commit e854df61 authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'for-2.6.35' of...

Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
parents 67a3e12b 29512c95
...@@ -13,9 +13,18 @@ config SND_MXC_SOC_SSI ...@@ -13,9 +13,18 @@ config SND_MXC_SOC_SSI
config SND_MXC_SOC_WM1133_EV1 config SND_MXC_SOC_WM1133_EV1
tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" 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_SOC_WM8350
select SND_MXC_SOC_SSI select SND_MXC_SOC_SSI
help help
Enable support for audio on the i.MX31ADS with the WM1133-EV1 Enable support for audio on the i.MX31ADS with the WM1133-EV1
PMIC board with WM8835x fitted. 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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment