diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:37 +0000 |
| commit | ed87e2974e3659139d8d27ea13b730288e6702c3 (patch) | |
| tree | 5d3481c3f3be1a658a0080734a259555ac0a0982 /sound | |
| parent | 64a071331ac773d39a20e266fc640cc7cd99277e (diff) | |
| parent | 52554fbd2f88a432a16e9e88e14c4b02ccb7cdb6 (diff) | |
| download | op-kernel-dev-ed87e2974e3659139d8d27ea13b730288e6702c3.zip op-kernel-dev-ed87e2974e3659139d8d27ea13b730288e6702c3.tar.gz | |
Merge remote-tracking branch 'asoc/fix/cirrus' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/cirrus/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/cirrus/Kconfig b/sound/soc/cirrus/Kconfig index 7b7fbcd..c7cd60f 100644 --- a/sound/soc/cirrus/Kconfig +++ b/sound/soc/cirrus/Kconfig @@ -16,7 +16,7 @@ config SND_EP93XX_SOC_AC97 config SND_EP93XX_SOC_SNAPPERCL15 tristate "SoC Audio support for Bluewater Systems Snapper CL15 module" - depends on SND_EP93XX_SOC && MACH_SNAPPER_CL15 + depends on SND_EP93XX_SOC && MACH_SNAPPER_CL15 && I2C select SND_EP93XX_SOC_I2S select SND_SOC_TLV320AIC23_I2C help |
