diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-22 20:12:13 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-22 20:12:13 +0900 |
| commit | 8174b35f1d9b54b740a935410c7b3891e3e2a119 (patch) | |
| tree | 95427a4dd7248c41547a9a8d4afcfe7aa9a3a9fd /sound/soc/mediatek | |
| parent | fcde5a7eca1a28d3f7158399809cb01f83bd0114 (diff) | |
| parent | 81f70ba233d5f660e1ea5fe23260ee323af5d53a (diff) | |
Merge tag 'v4.5-rc5' into asoc-mtk
Linux 4.5-rc5
Diffstat (limited to 'sound/soc/mediatek')
| -rw-r--r-- | sound/soc/mediatek/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 15c04e2eae34..976967675387 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -9,7 +9,7 @@ config SND_SOC_MEDIATEK config SND_SOC_MT8173_MAX98090 tristate "ASoC Audio driver for MT8173 with MAX98090 codec" - depends on SND_SOC_MEDIATEK + depends on SND_SOC_MEDIATEK && I2C select SND_SOC_MAX98090 help This adds ASoC driver for Mediatek MT8173 boards @@ -19,7 +19,7 @@ config SND_SOC_MT8173_MAX98090 config SND_SOC_MT8173_RT5650_RT5676 tristate "ASoC Audio driver for MT8173 with RT5650 RT5676 codecs" - depends on SND_SOC_MEDIATEK + depends on SND_SOC_MEDIATEK && I2C select SND_SOC_RT5645 select SND_SOC_RT5677 help |