Merge branch 'fix/asoc' into for-linus

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