summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-01 12:33:26 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-01 12:33:26 +0200
commit834eb6c599a8efa1fe9b77d469562e0c78c876e1 (patch)
tree46e2394e437a6f5a772fc3ad2022e071b1e01ad7 /sound/soc
parentASoC: fix kconfig order of Blackfin drivers (diff)
parentASoC: Fix dependency of CONFIG_SND_PXA2XX_SOC_IMOTE2 (diff)
downloadlinux-834eb6c599a8efa1fe9b77d469562e0c78c876e1.tar.xz
linux-834eb6c599a8efa1fe9b77d469562e0c78c876e1.zip
Merge remote branch 'takashi/fix/asoc' into for-2.6.32
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/pxa/Kconfig2
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