From: Mark Brown <broonie@linaro.org>
Date: Thu, 6 Jun 2013 13:29:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next
X-Git-Tag: next-20130607~56^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=492f7c1904857e138a85b24d07ae91e64c126d62;p=karo-tx-linux.git

Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next
---

492f7c1904857e138a85b24d07ae91e64c126d62
diff --cc sound/soc/codecs/Makefile
index 73c37296db12,d85be48a6c07..72247abe9b25
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -50,8 -50,9 +50,9 @@@ snd-soc-alc5632-objs := alc5632.
  snd-soc-sigmadsp-objs := sigmadsp.o
  snd-soc-si476x-objs := si476x.o
  snd-soc-sn95031-objs := sn95031.o
 -snd-soc-spdif-tx-objs := spdif_transciever.o
 +snd-soc-spdif-tx-objs := spdif_transmitter.o
  snd-soc-spdif-rx-objs := spdif_receiver.o
+ snd-soc-ssm2518-objs := ssm2518.o
  snd-soc-ssm2602-objs := ssm2602.o
  snd-soc-sta32x-objs := sta32x.o
  snd-soc-sta529-objs := sta529.o