From: Mark Brown <broonie@linaro.org>
Date: Mon, 5 Aug 2013 17:12:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm
X-Git-Tag: v3.12-rc1~43^2~15^2~33^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2;p=kernel%2Fkernel-generic.git

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

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

6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2
diff --cc sound/soc/codecs/Kconfig
index 4afe943,e2daf82..1b8ed17
--- a/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 811ca12,4a068d2..dff470a
--- a/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