| commit | 834eb6c599a8efa1fe9b77d469562e0c78c876e1 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Thu Oct 01 11:33:26 2009 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Thu Oct 01 11:33:26 2009 +0100 |
| tree | 46e2394e437a6f5a772fc3ad2022e071b1e01ad7 | |
| parent | df1246d84ab7edc375e6b6d236654ac0866229c5 [diff] | |
| parent | c877c25170e2655d519b29e91d6c91d5d1a72a6f [diff] |
Merge remote branch 'takashi/fix/asoc' into for-2.6.32
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 6375b4e..dcb3181b 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig
@@ -138,7 +138,7 @@ 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