Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:25 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:25 +0000 (17:20 +0100)
1  2 
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile

index c691e222670ad47126f21250253f7acec18a399f,04c87f77b7e8338340e8a9d7ab8999b969e88b75..0615e00b4ab7742199e958579684041d278718a2
@@@ -53,9 -53,10 +53,10 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_MC13783 if MFD_MC13XXX
        select SND_SOC_ML26124 if I2C
 -      select SND_SOC_OMAP_HDMI_CODEC if OMAP4_DSS_HDMI
 +      select SND_SOC_HDMI_CODEC
        select SND_SOC_PCM3008
        select SND_SOC_RT5631 if I2C
+       select SND_SOC_RT5640 if I2C
        select SND_SOC_SGTL5000 if I2C
        select SND_SOC_SI476X if MFD_SI476X_CORE
        select SND_SOC_SN95031 if INTEL_SCU_IPC
index 82aa34e034c5c438c96150c437a7041e13208aaa,732c4a7bd6aca2112f9fe4b662c52d659e0f9d0c..93b3e22204878c47244502d471e1451b47c2b0f2
@@@ -41,9 -41,10 +41,10 @@@ snd-soc-max98095-objs := max98095.
  snd-soc-max9850-objs := max9850.o
  snd-soc-mc13783-objs := mc13783.o
  snd-soc-ml26124-objs := ml26124.o
 -snd-soc-omap-hdmi-codec-objs := omap-hdmi.o
 +snd-soc-hdmi-codec-objs := hdmi.o
  snd-soc-pcm3008-objs := pcm3008.o
  snd-soc-rt5631-objs := rt5631.o
+ snd-soc-rt5640-objs := rt5640.o
  snd-soc-sgtl5000-objs := sgtl5000.o
  snd-soc-alc5623-objs := alc5623.o
  snd-soc-alc5632-objs := alc5632.o
@@@ -168,9 -169,10 +169,10 @@@ obj-$(CONFIG_SND_SOC_MAX98095)   += snd-s
  obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o
  obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o
  obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o
 -obj-$(CONFIG_SND_SOC_OMAP_HDMI_CODEC) += snd-soc-omap-hdmi-codec.o
 +obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-soc-hdmi-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
  obj-$(CONFIG_SND_SOC_SGTL5000)  += snd-soc-sgtl5000.o
  obj-$(CONFIG_SND_SOC_SIGMADSP)        += snd-soc-sigmadsp.o
  obj-$(CONFIG_SND_SOC_SI476X)  += snd-soc-si476x.o