From: Mark Brown <broonie@kernel.org>
Date: Sun, 24 Jul 2016 21:07:48 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc... 
X-Git-Url: https://git.efficios.com/?a=commitdiff_plain;h=e7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5;p=deliverable%2Flinux.git

Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next
---

e7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5
diff --cc sound/soc/codecs/Kconfig
index d54604fecd7f,4d82a58ff6b0,cf6d401fc823..1cd6ab344d67
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@ -44,10 -43,9 -43,8 +44,10 @@@@ config SND_SOC_ALL_CODEC
   	select SND_SOC_AK5386
   	select SND_SOC_ALC5623 if I2C
   	select SND_SOC_ALC5632 if I2C
  +	select SND_SOC_BT_SCO
   	select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
   	select SND_SOC_CS35L32 if I2C
 ++	select SND_SOC_CS35L33 if I2C
   	select SND_SOC_CS42L51_I2C if I2C
   	select SND_SOC_CS42L52 if I2C && INPUT
   	select SND_SOC_CS42L56 if I2C && INPUT
@@@@ -382,9 -370,9 -367,6 +382,9 @@@@ config SND_SOC_ALC562
   config SND_SOC_ALC5632
   	tristate
   
  +config SND_SOC_BT_SCO
 - 	tristate
 ++	tristate "Dummy BT SCO codec driver"
  +
   config SND_SOC_CQ0093VC
   	tristate
   
@@@@ -554,13 -532,9 -529,6 +554,13 @@@@ config SND_SOC_MAX9809
   config SND_SOC_MAX98357A
          tristate
   
  +config SND_SOC_MAX98371
  +       tristate
  +
 ++config SND_SOC_MAX98504
 ++	tristate "Maxim MAX98504 speaker amplifier"
 ++	depends on I2C
 ++
   config SND_SOC_MAX9867
   	tristate