Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm

Trivial add/add conflicts:
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile

diff --cc sound/soc/codecs/Kconfig
index 4afe94330820b791db33b0b2fbe70cec50585742,e2daf820179bff1410a04b4a7b842f67a0944a63..1b8ed17d56eded2390db7cccbd7ec8c741eda071
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -54,7 -54,7 +54,8 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_MC13783 if MFD_MC13XXX
        select SND_SOC_ML26124 if I2C
        select SND_SOC_HDMI_CODEC
+       select SND_SOC_PCM1681 if I2C
 +      select SND_SOC_PCM1792A if SPI_MASTER
        select SND_SOC_PCM3008
        select SND_SOC_RT5631 if I2C
        select SND_SOC_RT5640 if I2C
@@@ -293,9 -293,9 +294,12 @@@ config SND_SOC_MAX985
  config SND_SOC_HDMI_CODEC
         tristate
  
+ config SND_SOC_PCM1681
+        tristate
+ 
 +config SND_SOC_PCM1792A
 +       tristate
 +
  config SND_SOC_PCM3008
         tristate
  

diff --cc sound/soc/codecs/Makefile
index 811ca12febcb69df453e0e45c73c7d3cfdbb2178,4a068d20444dd8e95e71bdd1ee0c0c0e28c563c4..dff470a8e6b4c735c0e3cd52a5df0d2fc5eb7bf9
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -42,7 -42,7 +42,8 @@@ snd-soc-max9850-objs := max9850.
  snd-soc-mc13783-objs := mc13783.o
  snd-soc-ml26124-objs := ml26124.o
  snd-soc-hdmi-codec-objs := hdmi.o
+ snd-soc-pcm1681-objs := pcm1681.o
 +snd-soc-pcm1792a-codec-objs := pcm1792a.o
  snd-soc-pcm3008-objs := pcm3008.o
  snd-soc-rt5631-objs := rt5631.o
  snd-soc-rt5640-objs := rt5640.o
@@@ -172,7 -172,7 +173,8 @@@ obj-$(CONFIG_SND_SOC_MAX9850)      += snd-so
  obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o
  obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o
  obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-soc-hdmi-codec.o
+ obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o
 +obj-$(CONFIG_SND_SOC_PCM1792A)        += snd-soc-pcm1792a-codec.o
  obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o
  obj-$(CONFIG_SND_SOC_RT5631)  += snd-soc-rt5631.o
  obj-$(CONFIG_SND_SOC_RT5640)  += snd-soc-rt5640.o