From: Mark Brown <broonie@linaro.org>
Date: Mon, 17 Jun 2013 16:20:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next
X-Git-Tag: v3.11-rc4~4^2~3^2~1^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfe617d33db9871b1ac25b62e9086336cd633db2;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

bfe617d33db9871b1ac25b62e9086336cd633db2
diff --cc sound/soc/codecs/Makefile
index c8117cb,d85be48..70fd806
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -51,8 -50,9 +51,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