Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
+10
-1
sound/soc/imx/Kconfig
+10
-1
sound/soc/imx/Kconfig
···
13
13
14
14
config SND_MXC_SOC_WM1133_EV1
15
15
tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
16
-
depends on SND_IMX_SOC && EXPERIMENTAL
16
+
depends on SND_IMX_SOC && MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
17
17
select SND_SOC_WM8350
18
18
select SND_MXC_SOC_SSI
19
19
help
20
20
Enable support for audio on the i.MX31ADS with the WM1133-EV1
21
21
PMIC board with WM8835x fitted.
22
+
23
+
config SND_SOC_PHYCORE_AC97
24
+
tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
25
+
depends on MACH_PCM043 || MACH_PCA100
26
+
select SND_MXC_SOC_SSI
27
+
select SND_SOC_WM9712
28
+
help
29
+
Say Y if you want to add support for SoC audio on Phytec phyCORE
30
+
and phyCARD boards in AC97 mode