diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-04 15:42:37 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 15:42:37 -0500 |
| commit | ed87e2974e3659139d8d27ea13b730288e6702c3 (patch) | |
| tree | 5d3481c3f3be1a658a0080734a259555ac0a0982 /sound | |
| parent | 64a071331ac773d39a20e266fc640cc7cd99277e (diff) | |
| parent | 52554fbd2f88a432a16e9e88e14c4b02ccb7cdb6 (diff) | |
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 7b7fbcd49e5e..c7cd60f009e9 100644 --- a/sound/soc/cirrus/Kconfig +++ b/sound/soc/cirrus/Kconfig | |||
| @@ -16,7 +16,7 @@ config SND_EP93XX_SOC_AC97 | |||
| 16 | 16 | ||
| 17 | config SND_EP93XX_SOC_SNAPPERCL15 | 17 | config SND_EP93XX_SOC_SNAPPERCL15 |
| 18 | tristate "SoC Audio support for Bluewater Systems Snapper CL15 module" | 18 | tristate "SoC Audio support for Bluewater Systems Snapper CL15 module" |
| 19 | depends on SND_EP93XX_SOC && MACH_SNAPPER_CL15 | 19 | depends on SND_EP93XX_SOC && MACH_SNAPPER_CL15 && I2C |
| 20 | select SND_EP93XX_SOC_I2S | 20 | select SND_EP93XX_SOC_I2S |
| 21 | select SND_SOC_TLV320AIC23_I2C | 21 | select SND_SOC_TLV320AIC23_I2C |
| 22 | help | 22 | help |