diff options
| author | Mark Brown | 2009-10-01 12:35:11 +0200 |
|---|---|---|
| committer | Mark Brown | 2009-10-01 12:35:11 +0200 |
| commit | 17c86a32076f0119437a017de70a583431f4bf51 (patch) | |
| tree | e5cbe964817f67c6d0e58d4211d925da4b1d0bc8 /sound/soc/pxa/Kconfig | |
| parent | Merge remote branch 'takashi/topic/asoc' into for-2.6.33 (diff) | |
| parent | Merge remote branch 'takashi/fix/asoc' into for-2.6.32 (diff) | |
| download | kernel-qcow2-linux-17c86a32076f0119437a017de70a583431f4bf51.tar.gz kernel-qcow2-linux-17c86a32076f0119437a017de70a583431f4bf51.tar.xz kernel-qcow2-linux-17c86a32076f0119437a017de70a583431f4bf51.zip | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/pxa/Kconfig')
| -rw-r--r-- | sound/soc/pxa/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 6375b4ea525d..dcb3181bb340 100644 --- 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 |