diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-10-03 18:31:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-10-03 18:31:22 +0200 |
commit | a1cb9cd69750d6d62251393738efc02d252b67d3 (patch) | |
tree | 5c68b23180e6ca127d1048cdbf723ca447551123 /sound/soc/pxa/Kconfig | |
parent | 08d1e635089f41e28fec644a8620a0e8d66b1235 (diff) | |
parent | 834eb6c599a8efa1fe9b77d469562e0c78c876e1 (diff) | |
download | linux-rt-a1cb9cd69750d6d62251393738efc02d252b67d3.tar.gz |
Merge branch 'fix/asoc' into for-linus
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 |