summaryrefslogtreecommitdiffstats
path: root/sound/soc/kirkwood
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-03 11:07:43 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-03 11:07:43 +0000
commit672b0c6a37d3bf951a449cff9f6c98b7dfc47a16 (patch)
treeac3f92b9c0b6563c34eb5623efbe5167f4ac3508 /sound/soc/kirkwood
parent7d46a528c609418e0a61121aac75edaf4992b622 (diff)
parent36d54dc0c893b143748bcf13a1e3b7a00696115d (diff)
downloadop-kernel-dev-672b0c6a37d3bf951a449cff9f6c98b7dfc47a16.zip
op-kernel-dev-672b0c6a37d3bf951a449cff9f6c98b7dfc47a16.tar.gz
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/kirkwood')
-rw-r--r--sound/soc/kirkwood/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 8f49e16..c62d715 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -12,6 +12,7 @@ config SND_KIRKWOOD_SOC_I2S
config SND_KIRKWOOD_SOC_OPENRD
tristate "SoC Audio support for Kirkwood Openrd Client"
depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)
+ depends on I2C
select SND_KIRKWOOD_SOC_I2S
select SND_SOC_CS42L51
help
@@ -20,7 +21,7 @@ config SND_KIRKWOOD_SOC_OPENRD
config SND_KIRKWOOD_SOC_T5325
tristate "SoC Audio support for HP t5325"
- depends on SND_KIRKWOOD_SOC && MACH_T5325
+ depends on SND_KIRKWOOD_SOC && MACH_T5325 && I2C
select SND_KIRKWOOD_SOC_I2S
select SND_SOC_ALC5623
help
OpenPOWER on IntegriCloud