diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-02 11:47:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-02 11:47:24 +0100 |
| commit | 85252b6ae5f7e8bba570309d1945eba63c53ad3e (patch) | |
| tree | c74b1ff1984f34bd045154e1029c654eb5525ecc /sound/soc | |
| parent | 08a0b717578ab03db99367e69bfe6a4a71918e2c (diff) | |
| parent | 29512c95b5e2f0f245bfa4975ccae6c3449d4dd2 (diff) | |
Merge branch 'for-2.6.35' into for-2.6.36
Diffstat (limited to 'sound/soc')
| -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 |