diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-04 23:47:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-04 23:47:39 +0000 |
| commit | b71951d63d83194d449e8ec7b28c3f30176e8208 (patch) | |
| tree | 47b264ebcd35a947fef2dbd074bbe04760bc6474 /sound/soc/pxa | |
| parent | dd85ecc269a3aa537fd045e113b4755a3cd1284f (diff) | |
| parent | 570a2429e964f8d63338b3450ba801a263b29b3a (diff) | |
| download | linux-b71951d63d83194d449e8ec7b28c3f30176e8208.tar.gz linux-b71951d63d83194d449e8ec7b28c3f30176e8208.tar.bz2 linux-b71951d63d83194d449e8ec7b28c3f30176e8208.zip | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index ffd2242e305f..a0f7d3cfa470 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -151,6 +151,7 @@ config SND_SOC_ZYLONITE config SND_SOC_RAUMFELD tristate "SoC Audio support Raumfeld audio adapter" depends on SND_PXA2XX_SOC && (MACH_RAUMFELD_SPEAKER || MACH_RAUMFELD_CONNECTOR) + depends on I2C && SPI_MASTER select SND_PXA_SOC_SSP select SND_SOC_CS4270 select SND_SOC_AK4104 @@ -159,7 +160,7 @@ config SND_SOC_RAUMFELD config SND_PXA2XX_SOC_HX4700 tristate "SoC Audio support for HP iPAQ hx4700" - depends on SND_PXA2XX_SOC && MACH_H4700 + depends on SND_PXA2XX_SOC && MACH_H4700 && I2C select SND_PXA2XX_SOC_I2S select SND_SOC_AK4641 help |