diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:25 +0100 |
| commit | 3843e87ebd2f3304df5f75bb34b0ee207d3b4356 (patch) | |
| tree | e055caf4502df3d4386d8a2f7b301c4ed0b2c151 /sound/soc/pxa/Kconfig | |
| parent | b2d34a822bb2c9a17f24300de6cc79fe92f10787 (diff) | |
| parent | 55dafe5dc29c1a8e9ac4a14c38f9550ec79524c9 (diff) | |
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
Diffstat (limited to 'sound/soc/pxa/Kconfig')
| -rw-r--r-- | sound/soc/pxa/Kconfig | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 4d2e46fae77c..b35809467547 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -130,26 +130,6 @@ 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 MFD_88PM860X - 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 MFD_88PM860X - 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_PXA910_SOC tristate "SoC Audio for Marvell PXA910 chip" depends on ARCH_MMP && SND |