diff options
author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-23 12:58:01 +0100 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-23 12:58:01 +0100 |
commit | 97e15b1fcf79a60cb146d4123e7c72ac2736e258 (patch) | |
tree | 5923cd4d4f2e1945b66a7aab27acf684f8590c47 /sound/soc/pxa/Kconfig | |
parent | a8165e0e6f0511d14132423b4bce2d285e890fc8 (diff) | |
parent | 38fec7272bc033b75a0eb8976c56c2024d371b7d (diff) | |
download | kernel_samsung_smdk4412-97e15b1fcf79a60cb146d4123e7c72ac2736e258.zip kernel_samsung_smdk4412-97e15b1fcf79a60cb146d4123e7c72ac2736e258.tar.gz kernel_samsung_smdk4412-97e15b1fcf79a60cb146d4123e7c72ac2736e258.tar.bz2 |
Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37
Diffstat (limited to 'sound/soc/pxa/Kconfig')
-rw-r--r-- | sound/soc/pxa/Kconfig | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index e30c832..37f191b 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -117,6 +117,24 @@ config SND_PXA2XX_SOC_PALM27X Say Y if you want to add support for SoC audio on Palm T|X, T5, E2 or LifeDrive handheld computer. +config SND_SOC_SAARB + tristate "SoC Audio support for Marvell Saarb" + depends on SND_PXA2XX_SOC && MACH_SAARB + select SND_PXA_SOC_SSP + select SND_SOC_88PM860X + help + Say Y if you want to add support for SoC audio on the + Marvell Saarb reference platform. + +config SND_SOC_TAVOREVB3 + tristate "SoC Audio support for Marvell Tavor EVB3" + depends on SND_PXA2XX_SOC && MACH_TAVOREVB3 + select SND_PXA_SOC_SSP + select SND_SOC_88PM860X + help + Say Y if you want to add support for SoC audio on the + Marvell Saarb reference platform. + config SND_SOC_ZYLONITE tristate "SoC Audio support for Marvell Zylonite" depends on SND_PXA2XX_SOC && MACH_ZYLONITE |