summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-17 17:20:21 +0100
committerMark Brown <broonie@linaro.org>2013-06-17 17:20:21 +0100
commit18923d7ec799d53fe1a26ac67586dcd0ed59ac15 (patch)
tree9f2ca750046cfe999bbcc8a8f0379a2bfffa1cd9 /sound/soc/codecs/Makefile
parent0d664db6221e7f9f5649c3041f98adde00de2d97 (diff)
parentbf7c6e6ccbde22c96c5c1e5cec08740c31229df1 (diff)
downloadblackbird-op-linux-18923d7ec799d53fe1a26ac67586dcd0ed59ac15.tar.gz
blackbird-op-linux-18923d7ec799d53fe1a26ac67586dcd0ed59ac15.zip
Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Makefile')
-rw-r--r--sound/soc/codecs/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 5ba9be87e472..82aa34e034c5 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -41,7 +41,7 @@ snd-soc-max98095-objs := max98095.o
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-sgtl5000-objs := sgtl5000.o
@@ -168,7 +168,7 @@ obj-$(CONFIG_SND_SOC_MAX98095) += snd-soc-max98095.o
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_SGTL5000) += snd-soc-sgtl5000.o
OpenPOWER on IntegriCloud