Merge remote branch 'takashi/fix/asoc' into for-2.6.32

834eb6c5 · Mark Brown · df1246d8 · c877c251 · 834eb6c5
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

sound/soc/pxa/Kconfig sound/soc/pxa/Kconfig +1 -1

未找到文件。
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -138,7 +138,7 @@ config SND_PXA2XX_SOC_MIOA701
 config SND_PXA2XX_SOC_IMOTE2
       tristate "SoC Audio support for IMote 2"
-       depends on SND_PXA2XX_SOC && MACH_INTELMOTE2
+       depends on SND_PXA2XX_SOC && MACH_INTELMOTE2 && I2C
       select SND_PXA2XX_SOC_I2S
       select SND_SOC_WM8940
       help