summaryrefslogtreecommitdiffstats
path: root/sound/soc/mediatek/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-02-12 09:48:51 +0100
committerTakashi Iwai <tiwai@suse.de>2016-02-12 09:48:51 +0100
commit86c2ee16704522a546c0ee1e8238096e3c391468 (patch)
treeeb8f363d8f89b4b434e651c44565a13f7dce2e34 /sound/soc/mediatek/Kconfig
parent397da2d0ab0d1398242622d80a74df7245395c63 (diff)
parentf11aec0d7c835c3b83e74e3fd60d2e48a850c857 (diff)
downloadlinux-86c2ee16704522a546c0ee1e8238096e3c391468.tar.bz2
Merge tag 'asoc-fix-v4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.5 A rather large batch of fixes here, almost all in the Intel driver. The changes that got merged in this merge window for Skylake were rather large and as well as issues that you'd expect in a large block of new code there were some problems created for older processors which needed fixing up. Things are largely settling down now hopefully.
Diffstat (limited to 'sound/soc/mediatek/Kconfig')
-rw-r--r--sound/soc/mediatek/Kconfig4
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