diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
| commit | d61b04f801e6005182d432ebe4a0211c1d6feadd (patch) | |
| tree | aa085e56e1be528917212f41c485eebdfc072930 /sound/soc/mediatek/Kconfig | |
| parent | 30ff5957c3f1887d04ca01d839dc382739e48bde (diff) | |
| parent | 473f414564528a819f0c2bb6b4bf26366b64c9ab (diff) | |
| download | talos-op-linux-d61b04f801e6005182d432ebe4a0211c1d6feadd.tar.gz talos-op-linux-d61b04f801e6005182d432ebe4a0211c1d6feadd.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/soc/mediatek/Kconfig')
| -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 |
