Merge remote-tracking branches 'asoc/topic/cpcap', 'asoc/topic/cq93vc' and 'asoc...

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
index c1647babc74959482130e9d9f565085217f59abd,2aeee1ba034e6ddd533fceb6091ed7279951d648,da1571336f1e83a431c5a301b7c22e4ce12758a2,da1571336f1e83a431c5a301b7c22e4ce12758a2..ce09a9c8094825d80ffe226eb40114aeea9aa165
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
--- 3/sound/soc/codecs/Makefile
--- 4/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@@ -35,10 -34,9 -34,8 -34,8 +35,11 @@@@@ snd-soc-ak4641-objs := ak4641.
    snd-soc-ak4642-objs := ak4642.o
    snd-soc-ak4671-objs := ak4671.o
    snd-soc-ak5386-objs := ak5386.o
 +++snd-soc-ak5558-objs := ak5558.o
    snd-soc-arizona-objs := arizona.o
 +++snd-soc-bd28623-objs := bd28623.o
    snd-soc-bt-sco-objs := bt-sco.o
+ ++snd-soc-cpcap-objs := cpcap.o
    snd-soc-cq93vc-objs := cq93vc.o
    snd-soc-cs35l32-objs := cs35l32.o
    snd-soc-cs35l33-objs := cs35l33.o
@@@@@ -287,9 -281,9 -280,8 -280,8 +288,10 @@@@@ obj-$(CONFIG_SND_SOC_AK5558)    += snd-soc
    obj-$(CONFIG_SND_SOC_ALC5623)    += snd-soc-alc5623.o
    obj-$(CONFIG_SND_SOC_ALC5632)       += snd-soc-alc5632.o
    obj-$(CONFIG_SND_SOC_ARIZONA)       += snd-soc-arizona.o
 +++obj-$(CONFIG_SND_SOC_BD28623)       += snd-soc-bd28623.o
    obj-$(CONFIG_SND_SOC_BT_SCO)        += snd-soc-bt-sco.o
    obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o
+ ++obj-$(CONFIG_SND_SOC_CPCAP) += snd-soc-cpcap.o
    obj-$(CONFIG_SND_SOC_CS35L32)       += snd-soc-cs35l32.o
    obj-$(CONFIG_SND_SOC_CS35L33)       += snd-soc-cs35l33.o
    obj-$(CONFIG_SND_SOC_CS35L34)       += snd-soc-cs35l34.o