diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-01 06:35:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-01 06:35:11 -0400 |
| commit | 17c86a32076f0119437a017de70a583431f4bf51 (patch) | |
| tree | e5cbe964817f67c6d0e58d4211d925da4b1d0bc8 /sound/soc/pxa | |
| parent | f36c4045db71af89a7ea63425676925b7e6b4761 (diff) | |
| parent | 834eb6c599a8efa1fe9b77d469562e0c78c876e1 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/pxa')
| -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 | |||
| 138 | 138 | ||
| 139 | config SND_PXA2XX_SOC_IMOTE2 | 139 | config SND_PXA2XX_SOC_IMOTE2 |
| 140 | tristate "SoC Audio support for IMote 2" | 140 | tristate "SoC Audio support for IMote 2" |
| 141 | depends on SND_PXA2XX_SOC && MACH_INTELMOTE2 | 141 | depends on SND_PXA2XX_SOC && MACH_INTELMOTE2 && I2C |
| 142 | select SND_PXA2XX_SOC_I2S | 142 | select SND_PXA2XX_SOC_I2S |
| 143 | select SND_SOC_WM8940 | 143 | select SND_SOC_WM8940 |
| 144 | help | 144 | help |