diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-06 13:22:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-06 13:22:28 +0100 |
| commit | 6c39d6aca10ffac15f6decb6afd9080549fc2392 (patch) | |
| tree | 532e75637e12b3a4424d6fc56da8370d5b419806 /sound/soc/pxa/Kconfig | |
| parent | a020428364485751b607105c8f5a608f9b1fd38b (diff) | |
| parent | cefcc03ffc9527dde56807339edb1719c8dbae5f (diff) | |
| download | linux-3.10-6c39d6aca10ffac15f6decb6afd9080549fc2392.tar.gz linux-3.10-6c39d6aca10ffac15f6decb6afd9080549fc2392.tar.bz2 linux-3.10-6c39d6aca10ffac15f6decb6afd9080549fc2392.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/Kconfig')
| -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 ffd2242e305..a0f7d3cfa47 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 |